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

Deploy production ordering service doc (bp #2080) #2139

Merged
merged 1 commit into from
Dec 14, 2020

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 17, 2020

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

Cherry-pick of c545195 has failed:

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

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

Changes to be committed:

	new file:   docs/source/deployorderer/ordererchecklist.md
	new file:   docs/source/deployorderer/ordererdeploy.md
	new file:   docs/source/deployorderer/ordererplan.md
	modified:   docs/source/orderer/ordering_service.md

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

	both modified:   docs/source/deployment_guide_overview.rst

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/

@mergify mergify bot requested review from a team as code owners November 17, 2020 18:52
@mergify mergify bot added the conflicts label Nov 17, 2020
@denyeart
Copy link
Contributor

@joealewine I merged the release-2.2 PR. The release-2.1 PR has conflicts.

Change-Id: Ib7631cf4974da7005ae4a6fa7c0939a5ebe6588c
Signed-off-by: joe-alewine <Joe.Alewine@ibm.com>
(cherry picked from commit c545195)
@lindluni lindluni force-pushed the mergify/bp/release-2.1/pr-2080 branch from 7d7c943 to 8df0f22 Compare December 14, 2020 00:53
@lindluni
Copy link
Contributor

@joealewine Fixed the conflict, but I can't approve the change now that I am an author, so if you or @pamandrejko could do that, thank you

@joealewine
Copy link

Awesome. Thanks Brett!

@mergify mergify bot merged commit 7a0f13d into release-2.1 Dec 14, 2020
@mergify mergify bot deleted the mergify/bp/release-2.1/pr-2080 branch December 14, 2020 14:06
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.

3 participants