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

Lint 34644 #34651

Merged
merged 3 commits into from
Jul 13, 2016
Merged

Lint 34644 #34651

merged 3 commits into from
Jul 13, 2016

Conversation

rallytime
Copy link
Contributor

@rallytime rallytime commented Jul 13, 2016

Lint fix for #34644

Mike Place and others added 3 commits July 13, 2016 12:04
This prevents a number of errors in the error log and makes for a
more robust test IMHO
@rallytime rallytime merged commit bc63f25 into saltstack:2015.8 Jul 13, 2016
@rallytime rallytime deleted the lint-34644 branch July 13, 2016 22:58
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 15, 2016
* upstream/develop:
  Fixed file.line on Windows - fix saltstack#34665 (saltstack#34666)
  Revert "Modify lodaer global test to use populated dunders"
  INI uses proper line endings - fix saltstack#34667
  Spelling fixes found in sqlite3 pillar docs (saltstack#34652)
  Lint 34644 (saltstack#34651)
  Adjust the mine test a little bit to give it a better chance of success (saltstack#34647)
  catch error if no dns domains exist
  Check that mysqladmin exists before running mysql integration tests.
  add num_cpus grain to freebsd (saltstack#34565)
  Fixes failing test on Suse Leap (saltstack#34621)
  Changed network state test to use test=True
  Clarifies the proper way to reference states
  Some small changes
  handle jboss cli expression type in the parsing of the output
  Change network state integration test to use test=True
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

1 participant