Back-port #33851 to 2015.8 #34593
Merged
Back-port #33851 to 2015.8 #34593
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
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jul 13, 2016
* upstream/develop: (32 commits) Libcloud DNS module fix (saltstack#34628) Properly pass in userdata as string (saltstack#34623) Add NILinuxRT support to timezone execution module (saltstack#34556) Properly gate makostack (saltstack#34614) Add support for edge case when Cmd and Entrypoint can't be blanked (saltstack#34593) Update github IP for ssh state integration tests (saltstack#34592) When sorting list actual_data, make it a list (saltstack#34590) Avoid circular imports when calling salt.utils functions (saltstack#34586) [2016.3] Avoid salt.utils circular imports when using "from" (saltstack#34585) Adds a mock required for the network settings beacon Avoid circular imports when calling salt.utils functions (saltstack#34584) Gate docker unit test to check for docker (saltstack#34591) Typo (`defaul` → `default`) Add code formatting Fix typo (`seens` → `seen`) Add a bunch of documentation on getting files from other environments (saltstack#34560) Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test Handle cases where Docker Remote API returns an empty ExecutionDriver Rename tests.unit.simple to tests.unit.simple_test salt/modules/zypper.py: accept ignore_epoch argument ...
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.
Back-port #33851 to 2015.8