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

fix digital ocean image name in profile #37126

Merged
merged 2 commits into from Oct 20, 2016

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Oct 20, 2016

What does this PR do?

DO changed the name of their Ubuntu14 profile image. Need to update this for the salt cloud tests.

@Ch3LL
Copy link
Contributor Author

Ch3LL commented Oct 20, 2016

Please don't merge yet. Forgot to add something. Testing first

@Ch3LL
Copy link
Contributor Author

Ch3LL commented Oct 20, 2016

Okay should be good to go 👍

@rallytime rallytime merged commit f22c686 into saltstack:2016.3 Oct 20, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Oct 25, 2016
* upstream/develop: (31 commits)
  fixes pkgrepo for fedora>22 saltstack#31240
  Pylint fix
  Allow the minion test daemons a couple of tries to connect to the master (saltstack#37150)
  Add note about salt-bootstrap known issue for 2016.3.4 (saltstack#37152)
  Don't fail if host_to_ips returns None.
  pkgbuild.repo: fix GPG signing with `use_passphrase=False`
  Fix example signing policy in salt.states.x509 docs
  fix digital ocean image name in profile (saltstack#37126)
  add 2016.3.4 release notes (saltstack#37125)
  log.setup: only assign user if defined
  tests.integration: pass opts as a dict
  Skip weird_install test on Mac OS X
  Fix test_issue_6833_pip_upgrade_pip test on OSX
  For IPCClient, remove entry from instance map on close
  Fix race condition when returning events from commands
  pkgbuild.repo: add `timeout` parameter for waiting passphrase prompt
  Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting
  Add warning about GitPython 2.0.9 incompatibility with Python 2.6 (saltstack#37099)
  Use NotifyAccess=all in all unit files
  Lintfix: E8303 too many blank lines
  ...
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