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

Ensure tht pillar have freshest grains #33910

Merged
merged 1 commit into from
Jun 9, 2016

Conversation

cachedout
Copy link
Contributor

Refs #33076

@rallytime rallytime merged commit 261baeb into saltstack:2016.3 Jun 9, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 9, 2016
* upstream/develop: (211 commits)
  Fix merge error caught by tests
  Add boto3 to utils call
  Pylint fix
  Ensure tht pillar have freshest grains (saltstack#33910)
  Support additional eselect parameters. (saltstack#33876)
  Ensure tht pillar have freshest grains
  Add note about Xenial packages to 2016.3.0 release notes (saltstack#33870)
  add 2016.3.1 release notes (saltstack#33883)
  Fixup new groupadd tests for syntax change in 2016.3
  Use errno
  Set master and cloud to log level warning (saltstack#33861)
  Correct silly mistake
  Allow socket closes when the socket is disconnected
  Add support for edge case when Cmd and Entrypoint can't be blanked
  Remove matcher tests
  Fix another unit test stacktrace in pkg_resource
  Fixing more stupid unit tests
  Fix some more lint
  Fix/add unit tests for state
  Fix broken locate.locate function
  ...
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

2 participants