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

Remove unnecessarily-disabled sanity check #34325

Merged
merged 1 commit into from
Jun 28, 2016

Conversation

terminalmage
Copy link
Contributor

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.

@terminalmage terminalmage changed the title Remove unnecessarily-deleted sanity check Remove unnecessarily-disabled sanity check Jun 28, 2016
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.
@justinta
Copy link

Go Go Jenkins!

@rallytime rallytime merged commit b793426 into saltstack:2015.8 Jun 28, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 29, 2016
* upstream/develop: (44 commits)
  Send traps to Zabbix when there is a comment and name in result.
  Fix invalid syntax error in system.py module exception handling
  Don't forget the pylint disables for range
  Back-port saltstack#34256 to 2016.3 (saltstack#34343)
  Pylint fixes
  Revert py3modernize lint changes (saltstack#34339)
  Add listen/listen_in support to stateconf.py
  Change merge-if-exists logic to properly report changes
  Doc clarifications to file modules, addition of new `profile` log level to docs, fixed example in dnsmasq (saltstack#34323)
  version checking had a logical error (saltstack#34333)
  fix saltstack#34329 (saltstack#34330)
  Remove unnecessarily-disabled sanity check (saltstack#34325)
  Do not force 'filter' table when flushing
  add osmajorrelease to ubuntu and fix pylint
  Fix psutil.cpu_times unpack error (saltstack#34318)
  Typo in dockerio doc (saltstack#34319)
  add osmajorrelease grain for raspbian
  [2016.3] Update to latest bootstrap script v2016.06.27
  [2015.8] Update to latest bootstrap script v2016.06.27
  [2015.5] Update to latest bootstrap script v2016.06.27
  ...
@terminalmage terminalmage deleted the reenable-sanity-check branch July 7, 2016 20:09
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