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

Automatic backport of pull request #3052 #3098

Merged
merged 1 commit into from Mar 26, 2019
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 26, 2019

This is an automated backport of pull request #3052 done by Mergify.io

Cherry-pick of 0e73eb5 has failed:

On branch mergify/bp/3.14/pr-3052
Your branch is up to date with 'origin/3.14'.

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

Changes to be committed:

	modified:   production.ini

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

	both modified:   bodhi/server/config.py
	both modified:   bodhi/server/models.py
	both modified:   bodhi/tests/server/test_models.py

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

The previous change to look up Flatpaks under 'flatpaks/' rather than
'modules/' was backwards incompatible - to restore compatibility, make
this a new config setting: pagure_flatpak_namespace.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
(cherry picked from commit 0e73eb5)

# Conflicts:
#	bodhi/server/config.py
#	bodhi/server/models.py
#	bodhi/tests/server/test_models.py
@mergify mergify bot requested a review from a team as a code owner March 26, 2019 10:49
@abompard abompard merged commit 613f37e into 3.14 Mar 26, 2019
@mergify mergify bot deleted the mergify/bp/3.14/pr-3052 branch March 26, 2019 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants