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

keep this beacon from stack tracing at the loader #34825

Merged
merged 1 commit into from
Jul 20, 2016

Conversation

thatch45
Copy link
Contributor

@thatch45 thatch45 commented Jul 20, 2016

What does this PR do?

this beacon was stack tracing in the loader, this fixes it

@rallytime rallytime merged commit 7bda166 into saltstack:2016.3 Jul 20, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 21, 2016
* upstream/develop: (32 commits)
  Update 2016.3.2 release notes (saltstack#34850)
  Skip GCE unit tests - causes test suite to hang
  Update release notes for 2016.3.2 (saltstack#34848)
  Fix comment in master config, prevents the service from starting
  Fix Salt failure after merge of saltstack#34683
  drop parsing of vdevs, error passthrough from zpool cli
  eliminate hardcoded vdev type from zpool state
  update the state wrapper to include show_low_sls
  salt.states.zpool - work with updates exec module
  salt.module.zpool - fix bug with properties on/off being parsed as true/false
  Check if a valid value is passed to unlyif/unless
  Fix saltstack#34345
  salt.modules.zpool - drop vdev types to make it more future proof, fallback to zpool cli error messages
  keep this beacon from stack tracing at the loader (saltstack#34825)
  Skip mysql state test if mysqladmin is not available
  Lintfix PEP8: E262
  salt/state.py: set `chunk['order'] = 0' with `order: first'; fixes saltstack#24744
  Lint
  Document master setting
  Set up dynamic config
  ...
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