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

[2015.5] Merge forward from 2014.7 to 2015.5 #27759

Merged
merged 3 commits into from Oct 7, 2015

Conversation

Projects
None yet
2 participants
@basepi
Collaborator

basepi commented Oct 7, 2015

[2015.5] Merge forward from 2014.7 to 2015.5

No conflicts

Jason Wolfe and others added some commits Sep 25, 2015

Jason Wolfe
Ensure we pass on the enable setting if present, or use the default o…
…f True if not in build_schedule_item()

Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run.  schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition.
Merge pull request #27390 from JaseFace/schedule-missing-enabled
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()

basepi added a commit that referenced this pull request Oct 7, 2015

Merge pull request #27759 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5

@basepi basepi merged commit b2937b6 into saltstack:2015.5 Oct 7, 2015

0 of 2 checks passed

default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #10100 — RUNNING
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment