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

refs#33348: fix ret status code for state.sls_id #33349

Merged
merged 1 commit into from
May 19, 2016

Conversation

adubkov
Copy link
Contributor

@adubkov adubkov commented May 18, 2016

What does this PR do?

  • Fix return status code for state.sls_id.
  • Initialize ret variable which was initialized in try....except...finally.

What issues does this PR fix or reference?

#33348

Tests written?

None, unless there are existing tests for state module.

@adubkov adubkov force-pushed the refs#33348-retcode-sls-id branch from 084c573 to f1c232e Compare May 18, 2016 23:53
@adubkov adubkov force-pushed the refs#33348-retcode-sls-id branch from f1c232e to 5a0ab7f Compare May 18, 2016 23:58
@cachedout cachedout merged commit e30ad3b into saltstack:develop May 19, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request May 20, 2016
* upstream/develop:
  revved latest to 2015.8.9, added note regarding Mint Linux to 2015.8.9 release notes
  Event assert (saltstack#33262)
  Catch exception raised from invalid verify_options (saltstack#33317)
  states/file.prepend: fixes saltstack#32915 define file header verbatim, in inp… (saltstack#33270)
  Add support for kapacitor 0.13 (saltstack#33352)
  verify_socket: show what interface:port is in error; DRY refactoring (saltstack#33320)
  Eliminate dry-run false positives for files in /tmp (saltstack#33344)
  refs#33348: fix ret status code for state.sls_id (saltstack#33349)
  adding the () to make changes work (saltstack#33337)
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.

2 participants