fix #34329 #34330
Merged
fix #34329 #34330
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
|
Thanks @clinta |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 29, 2016
* upstream/develop: (44 commits) Send traps to Zabbix when there is a comment and name in result. Fix invalid syntax error in system.py module exception handling Don't forget the pylint disables for range Back-port saltstack#34256 to 2016.3 (saltstack#34343) Pylint fixes Revert py3modernize lint changes (saltstack#34339) Add listen/listen_in support to stateconf.py Change merge-if-exists logic to properly report changes Doc clarifications to file modules, addition of new `profile` log level to docs, fixed example in dnsmasq (saltstack#34323) version checking had a logical error (saltstack#34333) fix saltstack#34329 (saltstack#34330) Remove unnecessarily-disabled sanity check (saltstack#34325) Do not force 'filter' table when flushing add osmajorrelease to ubuntu and fix pylint Fix psutil.cpu_times unpack error (saltstack#34318) Typo in dockerio doc (saltstack#34319) add osmajorrelease grain for raspbian [2016.3] Update to latest bootstrap script v2016.06.27 [2015.8] Update to latest bootstrap script v2016.06.27 [2015.5] Update to latest bootstrap script v2016.06.27 ...
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.
What does this PR do?
What issues does this PR fix or reference?
#34329
Previous Behavior
file.serialize with merge_if_exists fails with 'function' object has no attribute 'deserialize'
New Behavior
file.serialize with merge_if_exists works as expected
Tests written?
No
Please review Salt's Contributing Guide for best practices.