Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2016.3] Merge forward from 2015.8 to 2016.3 #34348

Merged
merged 17 commits into from
Jun 28, 2016

Conversation

rallytime
Copy link
Contributor

No conflicts.

rallytime and others added 17 commits June 27, 2016 10:22
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.
[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.
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
@rallytime rallytime merged commit c89d1ad into saltstack:2016.3 Jun 28, 2016
@rallytime rallytime deleted the merge-2016.3 branch June 28, 2016 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants