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

states.schedule: splay is not ordereddict #36894

Merged
merged 1 commit into from
Oct 11, 2016
Merged

Conversation

jfindlay
Copy link
Contributor

What does this PR do?

Fix example schedule.present state.

What issues does this PR fix or reference?

#36855

Tests written?

No

@rallytime rallytime merged commit a23ce84 into saltstack:2016.3 Oct 11, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Oct 13, 2016
* upstream/develop: (39 commits)
  add option to force a reauth for a docker registry (saltstack#36893)
  Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (saltstack#36875)
  Adjust linux_acl unit test argument ordering
  Try to get SDB profile from pillar (saltstack#36934)
  doc: document what the argument of salt --subset means (saltstack#36943)
  - acl.delfacl: fix position of -X option to setfacl
  Revert change in default value for top_file_merging_strategy (saltstack#36922)
  modules/apk.py: Ensure we don't error on version extraction (saltstack#36921)
  Add FreeBSD and SmartOS to RC packages list (saltstack#36916)
  smbios.get should handle missing /dev/mem to not have useless grains (saltstack#36909)
  Properly handle "shared" arg in git.init when it is a bool (saltstack#36912)
  Pass through port as int and not str (saltstack#36910)
  Handle missing cache data a little more gracefully (saltstack#36908)
  modules: debian_ip: override params early to fix diff (saltstack#36820)
  states.schedule: splay is not ordereddict (saltstack#36894)
  Check for test=True in salt.wait_for_event orchestration events (saltstack#36897)
  Fix traceback on "salt-ssh -h" (saltstack#36888)
  salt-ssh: Try "command -v" before falling back to "which" (saltstack#36889)
  Update list of RC build platforms, fix example (saltstack#36887)
  Fix KeyError when loading runit execution module (saltstack#36882)
  ...
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