[2016.3] Merge forward from 2015.8 to 2016.3 #34348
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
The example is out of date compared to the actual test it's modeling. Notably, the self.state_result() function doesn't exist.
Fix test example in integration testing docs
[2015.8] Update to latest bootstrap script v2016.06.27
[2015.5] Update to latest bootstrap script v2016.06.27
The "table" argument is already part of the function signature, this means that flush() will always force the "filter" table even when the user sets a different one.
No conflicts.
[2015.8] Merge forward from 2015.5 to 2015.8
This was commented out for reasons having nothing to do with anything else going on in 0c069dd. Uncommenting this sanity check so that we are notified if we need to update our targets in the future.
…el to docs, fixed example in dnsmasq (saltstack#34323) Refs saltstack#34249 Refs saltstack#34261 Refs saltstack#33694 Refs saltstack#34247
Fix iptables.flush state: Do not force 'filter' table when flushing
* salt/__init__.py: revert py3modernize lint changes * salt/cloud/clouds/vmware.py: revert py3modernize lint changes * salt/modules/jboss7_cli.py: revert py3modernize lint changes * salt/payload.py: revert py3modernize lint changes * salt/serializers/yamlex.py: revert py3modernize lint changes * salt/states/win_servermanager.py: use absolute imports * salt/utils/args.py: revert py3modernize lint changes * salt/utils/decorators/__init__.py: use __name__ instead of func_name __name__ is py3-compatible and also works on builtins in py2, which func_name does not. * salt/utils/compat.py: revert py3modernize lint changes * salt/utils/__init__.py: revert py3modernize lint changes * salt/version.py: revert py3modernize lint changes * tests/salt-tcpdump.py: revert py3modernize lint changes
No conflicts.
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.
No conflicts.