Skip to content

Schedule/feature/13054 rangespan rebase#642

Merged
jeffweiss merged 3 commits intopuppetlabs:masterfrom
seanmil:schedule/feature/13054_rangespan-rebase
Apr 10, 2012
Merged

Schedule/feature/13054 rangespan rebase#642
jeffweiss merged 3 commits intopuppetlabs:masterfrom
seanmil:schedule/feature/13054_rangespan-rebase

Conversation

@seanmil
Copy link
Contributor

@seanmil seanmil commented Apr 9, 2012

I rebased on master after discussion and approval of the feature submission I originally put in pull request 574: #574

This should be clean to apply on the current master branch.

Cheers!

seanmil added 3 commits April 8, 2012 21:09
Allow schedule ranges to span the midnight boundary properly.  For
instance, for a 9 PM to 3 AM change window you can simply state
"range => '21:00 - 03:00'" instead of
"range => ['21:00 - 23:59', '00:00 - 03:00' ]"
Part 2, adjust for the special adjustments needed to properly
handle the day-of-week parameter when spanning days.
Per Kelsey Hightower's suggestion, move the multiple
'include ScheduleTesting' statements in the specfile to the parent
parent describe block.
@jeffweiss
Copy link
Contributor

@seanmil Thanks for rebasing your contribution! Since this supersedes the previous pull request (#574), can you please close 574?

I'll just quickly verify that this still passes spec and acceptance tests.

@seanmil
Copy link
Contributor Author

seanmil commented Apr 10, 2012

@jeffweiss Thanks, I've closed the prior pull request. Let me know if I can do anything else on this.

@jeffweiss jeffweiss merged commit 7d253f1 into puppetlabs:master Apr 10, 2012
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