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

Bump CouchDB to 3.2.2 (backport #3369) #3375

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 3, 2022

This is an automatic backport of pull request #3369 done by Mergify.
Cherry-pick of 3a55a56 has failed:

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

You are currently cherry-picking commit 3a55a5652.
  (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)

Changes to be committed:
	modified:   docs/source/couchdb_as_state_database.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile
	both modified:   integration/runner/couchdb.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

Update CouchDB to 3.2.2.
Update CouchDB doc refererences to 'stable' so that the links
don't point to outdated CouchDB versions.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
(cherry picked from commit 3a55a56)

# Conflicts:
#	Makefile
#	integration/runner/couchdb.go
@mergify mergify bot requested review from a team as code owners May 3, 2022 19:06
@mergify mergify bot added the conflicts label May 3, 2022
@mergify mergify bot mentioned this pull request May 3, 2022
@denyeart denyeart closed this May 3, 2022
@mergify mergify bot deleted the mergify/bp/release-2.2/pr-3369 branch May 3, 2022 20:20
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.

1 participant