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

Update pkg integration test to match #35415 #35706

Merged
merged 1 commit into from
Aug 23, 2016

Conversation

justinta
Copy link

What does this PR do?

#35415 Changed suse's os family from SUSE to Suse. This updates the pkg test to get the right packages for the tests.

What issues does this PR fix or reference?

#35415

Tests written?

Yes

@rallytime rallytime merged commit 6395539 into saltstack:develop Aug 23, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Aug 25, 2016
* upstream/develop: (65 commits)
  Add ability to set a default ASG termination policy.
  Add master build package build
  Add minion only script
  Fix snapper_test for python26
  os_family is Suse not SUSE (saltstack#35706)
  Don't assume we have a file to remove in tearDown (saltstack#35709)
  Template context must be populated with key:value pairs
  Refresh pillar only if minion is connected to master
  Add `force_refresh` option to grains updating minion events
  Remove outputter kwarg from jobs runner. It has been deprecated.
  Add whitelist for windows tests
  Fix tests (saltstack#35693)
  fixed the randomization portion of the exponential backoff wait time.
  fixed a bug in retry mechanism.
  changed boto_vpc's nat_gateway absent state's wait_for_delete_retries to be 0 to be backward compatible with previous releases.
  added wait and wait retries for delete_nat_gateway (otherwise releasing elastic ip will fail miserably).
  Improved connection to a VMware vCenter Server or ESXi host
  Add integration test for shadow module
  shadow: Fix return values for some functions
  Include grains in status moduele for unit test
  ...
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