summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | (#6928) Don't blow up when the method is undefined...Daniel Pittman2011-04-211-6/+4
| | * | | | | | | | | | Merge branch 'bug/2.7.x/6928-backport-symbol-to_proc' into 2.7.xDaniel Pittman2011-04-211-0/+9
| | |\| | | | | | | | |
| | | * | | | | | | | | (#6928) backport Symbol#to_proc for Ruby < 1.8.7Daniel Pittman2011-04-211-0/+9
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'feature/2.7.x/7183-implement-invisible-glob-version-matching-fo...Daniel Pittman2011-04-217-75/+125
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#7183) Implement "invisible glob" version matching for facesDaniel Pittman2011-04-215-47/+98
| | | * | | | | | | | | maint: better disabling of Signal#trap in our tests.Daniel Pittman2011-04-212-0/+10
| | | * | | | | | | | | maint: more robust listing of valid faces.Daniel Pittman2011-04-211-1/+1
| | | * | | | | | | | | maint: clean up testing code a fraction...Daniel Pittman2011-04-201-22/+10
| | | * | | | | | | | | maint: better error report for a missing version of a face.Daniel Pittman2011-04-201-1/+1
| | | * | | | | | | | | maint: handle face clear/reset sanely in the interface spec.Daniel Pittman2011-04-201-5/+6
| | |/ / / / / / / / /
| | * | | | | | | | | maint: stop stubbing log level setting.Daniel Pittman2011-04-2012-79/+24
| | * | | | | | | | | Move tests from Puppet-acceptance repoDominic Maraglia2011-04-2092-0/+2074
| | * | | | | | | | | Merge branch 'bug/2.7.x/7116-cannot-use-faces-with---debug' into 2.7.xDaniel Pittman2011-04-202-104/+126
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#7116) Handle application-level options in parse_optionsDaniel Pittman2011-04-202-1/+25
| | | * | | | | | | | | maint: fix gratuitous whitespace in the code.Daniel Pittman2011-04-201-2/+2
| | | * | | | | | | | | maint: remove redundant context from the test.Daniel Pittman2011-04-201-103/+101
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'bug/2.7.x/7062-improve-cloudpack-option-parsing-errors' into 2.7.xDaniel Pittman2011-04-202-28/+105
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#7062) better argument handling in the action wrapper methodsDaniel Pittman2011-04-202-8/+86
| | | * | | | | | | | | maint: move method comments outside the comment.Daniel Pittman2011-04-201-20/+19
| | * | | | | | | | | | Merge branch 'ticket/2.7.x/7166' into 2.7.xJosh Cooper2011-04-196-20/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish"James Turnbull2011-04-196-20/+20
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'ticket/2.7.x/maint-remove_duplicate_faces_code' into 2.7.xMatt Robinson2011-04-193-30/+0
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | maint: Remove unused faces codeMatt Robinson2011-04-193-30/+0
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'next'Josh Cooper2011-04-21103-808/+3597
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch '2.7.next' into nextJosh Cooper2011-04-219-37/+129
| |\| | | | | | | | |
| | * | | | | | | | | Merge branch '2.6.next' into 2.7.nextJosh Cooper2011-04-2195-0/+2087
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.nextJesse Wolfe2011-04-201-0/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Maint: Fix a #4655 introduced log inconsistencyJesse Wolfe2011-04-201-0/+2
| | | |/ / / / / / / /
| | | * | | | | | | | Move acceptance tests from puppet-acceptance repoDominic Maraglia2011-04-2093-0/+2084
| | | * | | | | | | | Merge branch 'ticket/2.6.next/7166' into 2.6.nextJosh Cooper2011-04-206-20/+20
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish"James Turnbull2011-04-206-20/+20
| | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2...Jacob Helwig2011-04-198-67/+151
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | (#4655) Allow stage to be set using a default class parameterJacob Helwig2011-04-196-66/+104
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.nextJames Turnbull2011-04-141-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fixed #6681 - Remove --force-yes option from aptitude is usedJames Turnbull2011-03-121-0/+1
| | | | | |_|_|/ / / / | | | | |/| | | | | |
| | * | | | | | | | | Merge branch 'ticket/2.7.next/7021-order_dependent_test_failure' into 2.7.nextMatt Robinson2011-04-214-37/+12
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#7021) Fix order dependent spec failuresMatt Robinson2011-04-213-3/+12
| | | * | | | | | | | | maint: Remove unused codeMatt Robinson2011-04-211-34/+0
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'maint/defined_type_has_two_parents' into nextJesse Wolfe2011-04-201-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Maint: Fix a #4655 introduced log inconsistencyJesse Wolfe2011-04-201-0/+2
| | |/ / / / / / / / /
| * / / / / / / / / / Moving tests from Puppet-acceptance repoDominic Maraglia2011-04-2093-0/+2113
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ticket/next/pson-ordering' into nextMax Martin2011-04-191-1/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | maint: Fix PSON order dependency in testMax Martin2011-04-191-1/+6
| * | | | | | | | | | Merge remote-tracking branch 'jamtur01/tickets/master/7166' into nextJosh Cooper2011-04-196-20/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish"James Turnbull2011-04-206-20/+20
| * | | | | | | | | | Merge branch '2.7.x' into nextJesse Wolfe2011-04-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | maint: mangle grammer in rspec to avoid Jenkins fail...Daniel Pittman2011-04-191-2/+2
| * | | | | | | | | | Merge branch 'tickets/2.7.x/4655-parameterized-classes-default-stages' into nextJacob Helwig2011-04-196-64/+100
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | (#4655) Allow stage to be set using a default class parameterJacob Helwig2011-04-196-64/+100
| * | | | | | | | | | Merge branch 'bug/2.7.x/6752-allow-action-specific-render-methods'Daniel Pittman2011-04-1916-214/+383
| |\ \ \ \ \ \ \ \ \ \