[2018.3] Merge forward from 2017.7 to 2018.3 #48297
Merged
Conversation
This file contains 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
This allows for custom types to be synced before executing states, when not running a highstate.
This mocking was added to setup_loader_modules and is no longer needed in individual tests.
A quick bugfix release was added after 2018.3.1, so this code will not make it in until 2018.3.3.
…in the way of changing container's state.
I was looking at the [SDB cache module](https://docs.saltstack.com/en/latest/ref/sdb/all/salt.sdb.cache.html#module-salt.sdb.cache) and it appears that there's a little bug (probably caused by some recent changes in the caching system): ```bash Exception occurred in runner sdb.set: Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/salt/client/mixins.py", line 382, in _low data['return'] = self.functions[fun](*args, **kwargs) File "/usr/lib/python2.7/dist-packages/salt/runners/sdb.py", line 42, in set_ return salt.utils.sdb.sdb_set(uri, value, __opts__, __utils__) File "/usr/lib/python2.7/dist-packages/salt/utils/sdb.py", line 77, in sdb_set return loaded_db[fun](query, value, profile=profile) File "/usr/lib/python2.7/dist-packages/salt/sdb/cache.py", line 72, in set_ cache.set(profile['bank'], key=key, value=value) AttributeError: 'Cache' object has no attribute 'set' ``` The `set` method doesn't exist: https://github.com/saltstack/salt/blob/2017.7.7/salt/sdb/cache.py#L72 This change is enough to fix the issue: ```bash bar ``` Moreover it seems to fix both the Execution Module and the Runner, as the Runner simply invokes the same code, via ``salt.utils.sdb``.
Add sample list data via command line pillar
…tes-update Update release notes for 2017.7.7
…-sync-docs Add "sync_mods" argument to state.apply/state.sls
SDB cache module: AttributeError: 'Cache' object has no attribute 'set'
do not expand kwargs for cloud.action
Bugfix saltstack#47984 messed up cert serial
Fix py2 thin dir issues
Fix: LXC legacy configuration key warnings falsely report errors during state change
Conflicts: - salt/modules/x509.py - salt/runners/cloud.py - tests/unit/modules/test_state.py
|
re-run py |
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.
Conflicts: