Synchronise 2025.1 with upstream #465
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
If a configuration file is tracked in the state file but no longer appears in config.json, it should either be restored or removed. This patch introduces a new exception StateMismatch and updates execute_config_check() to detect such cases. If any destination path is present in the defaults state but missing from config.json, we now raise StateMismatch. A dedicated unit test has been added to verify this behavior. Closes-Bug: #2114173 Signed-off-by: Michal Arbet <michal.arbet@ultimum.io> Change-Id: I6e0b4aaa5722990e3ac647578023f474db3d4381 (cherry picked from commit cf3c65f)
This reverts commit 535b2f2. Reason for revert: This change was reverted on all the other branches. Change-Id: I49015b8fc72c83449767bfce0737b0e44ed75808 Signed-off-by: Mariusz Karpiarz <mariusz.karpiarz@codethink.co.uk>
In stable branches we need both Erlang 26.2 (RabbitMQ 4.0) and Erlang 27 (RabbitMQ 4.1). Follows [1], adapted for stable branches where both versions are required. [1] https://review.opendev.org/c/openstack/kolla/+/959135 Change-Id: Ied94e0fac36e60cbf227eb9105f659adc1500545 Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
It was altered by mistake with [1][2]. [1] https://review.opendev.org/c/openstack/kolla/+/951938 [2] https://review.opendev.org/c/openstack/kolla/+/953858 Change-Id: I5cc6172156c908fbb968a3e3020f24ad8d9e58bf Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
github-actions
bot
added
automated
bbezak
approved these changes
Sep 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2025.1 from upstream stable/2025.1.