Back-port #32883 to 2015.8 #32928
Merged
Back-port #32883 to 2015.8 #32928
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
Apr 29, 2016
* upstream/develop: (29 commits) Add http_json external pillar (saltstack#32741) When move a function to a new namespace, allow to keep original context. (saltstack#32943) Add doc for ssl_chain (saltstack#32952) New state: NAPALM probes (saltstack#32947) OpenSSL.crypto.X509Extension object is not serializable (saltstack#32944) Adding intermediate certificate support to rest_cherrypy (saltstack#32941) fix versionadded for openvswitch module (saltstack#32945) fix py3 error in rand_str func_name is rthe same as __name__ in python2 func_name does not exist on python3 fix error in using alternate hash in py3 mode should default to 'text' (saltstack#32928) Fixing failures in gce_test and dimensiondata_test (saltstack#32921) Remove FileClient class references from docs - it doesn't exist. (saltstack#32925) Update contents_grains option with relevant docs (saltstack#32922) specify volume tags in profile configuration (saltstack#32908) Update docs to warn users that -1 isn't valid for iptables insert state (saltstack#32906) Allow profile options to be specified in provider file when using maps (saltstack#32900) Remove _get_date_time_format function (saltstack#32903) Reload renderers for local pillar after gitfs (saltstack#32912) ...
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 #32883 to 2015.8