Skip to content

Conversation

markgoddard
Copy link

Trivial conflicts on xena only in:
nova/conf/compute.py

NOTE(sbauza): Stable policy allows us to proactively merge a backport without waiting for the parent patch to be merged (exception to rule #4 in [1]. Marking [stable-only] in order to silence nova-tox-validate-backport

[1] https://docs.openstack.org/project-team-guide/stable-branches.html#appropriate-fixes

Related-Bug: #1996188
Change-Id: I5a399f1d3d702bfb76c067893e9c924904c8c360

Trivial conflicts on xena only in:
	nova/conf/compute.py

NOTE(sbauza): Stable policy allows us to proactively merge a backport without waiting for the parent patch to be merged (exception to rule #4 in [1]. Marking [stable-only] in order to silence nova-tox-validate-backport

[1] https://docs.openstack.org/project-team-guide/stable-branches.html#appropriate-fixes

Related-Bug: #1996188
Change-Id: I5a399f1d3d702bfb76c067893e9c924904c8c360
@markgoddard markgoddard requested a review from a team as a code owner January 25, 2023 10:11
@markgoddard markgoddard self-assigned this Jan 25, 2023
@markgoddard markgoddard merged commit e6fa8c0 into stackhpc/xena Jan 25, 2023
@markgoddard markgoddard deleted the xena-OSSA-2023-002 branch January 25, 2023 10:18
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.

2 participants