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

[FAB-18298] Default cluster cert and key (bp #2078) #2118

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 13, 2020

This is an automated backport of pull request #2078 done by Mergify

Cherry-pick of d620ab3 has failed:

On branch mergify/bp/release-2.2/pr-2078
Your branch is up to date with 'origin/release-2.2'.

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

Changes to be committed:

	modified:   integration/raft/cft_test.go
	modified:   orderer/common/server/main.go

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

	both modified:   orderer/common/server/main_test.go

To fixup this pull request, you can check out it 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/

Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com>
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
(cherry picked from commit d620ab3)

# Conflicts:
#	orderer/common/server/main_test.go
@mergify mergify bot requested a review from a team as a code owner November 13, 2020 13:37
@mergify mergify bot added the conflicts label Nov 13, 2020
@caod123 caod123 closed this Nov 13, 2020
@caod123 caod123 deleted the mergify/bp/release-2.2/pr-2078 branch November 13, 2020 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants