Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amended if clauses for the Test if the ssh_elevate_credential differs from the ssh_credential (backport #1586) #1589

Merged
merged 8 commits into from
Jun 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2021

This is an automatic backport of pull request #1586 done by Mergify.
Cherry-pick of 7110683 has failed:

On branch mergify/bp/master/pr-1586
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7110683e1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

In manage_sql.c:
  Amended the if clause for the Test if the ssh_credential
  differs from the ssh_elevate_credential in functions
  "create_target(...)" and "modify_target(...)".

(cherry picked from commit fbae05b)
…ntial Test.

(cherry picked from commit 7110683)

# Conflicts:
#	CHANGELOG.md
in manage_sql.c:
  Replaced the much to simple, erroneous if statement in function
  modify_target() by a more complex code.

(cherry picked from commit 6945200)
…again.

In manage_sql.c, in function modify_target(...):
  Replaced the code for the check if the ssh_elevate_credential
  differs from the ssh_credential by a new one, that works in
  any case.
  Amended the check if there is a ssh_elevate_credential without
  a ssh_credential.

(cherry picked from commit 566b77e)
@mergify mergify bot requested a review from a team as a code owner June 25, 2021 06:41
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 25, 2021
@timopollmeier timopollmeier added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Jun 28, 2021
@timopollmeier timopollmeier merged commit 59c3805 into master Jun 28, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-1586 branch June 28, 2021 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants