summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch '2.7.x' into 2.7.nextDaniel Pittman2011-05-06122-1028/+2737
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '2.6.next' into 2.7.nextMax Martin2011-04-276-9/+120
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'tickets/2.6.next/3420' into 2.6.nextJosh Cooper2011-04-261-1/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | (#3420) Nagios "name" attribute does not output correctlyJim Pirzyk2011-04-261-1/+9
| | * | | | | | | | | Merge branch 'tickets/2.6.next/4487' into 2.6.nextJosh Cooper2011-04-262-0/+15
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | (#4487) When setting environment on a host, ensure it is a string.Josh Cooper2011-04-262-0/+15
| | * | | | | | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | * | | | | | | | | | Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-futur...Jacob Helwig2011-04-222-8/+71
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | (#6487) Add some testing for OS X version support in DirectoryService providerJacob Helwig2011-04-221-0/+60
| | | * | | | | | | | | (#6487) Directoryservice provider will fail in future OS releasesGary Larizza2011-04-221-8/+11
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'tickets/2.7.next/7220' into 2.7.nextPieter van de Bruggen2011-04-254-0/+125
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | (#7220) Add the ability to "inherit" options.Pieter van de Bruggen2011-04-254-0/+125
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'tickets/2.7.next/6368-files-autorequire-nearest-ancestor-direct...Jacob Helwig2011-04-222-2/+65
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | (#6368) Make the File type autorequire its nearest ancestor directoryIan Ward Comfort2011-04-222-2/+65
| * | | | | | | | | | | Merge branch '2.7.x' into 2.7.nextMax Martin2011-04-2130-316/+532
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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 '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
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ 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 'ticket/2.7.x/maint-stub_trap' into 2.7.xMatt Robinson2011-05-194-8/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | maint: move trap call to Signal so we can stub it for specsMatt Robinson2011-05-194-8/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Updated CHANGELOG for 2.7.0rc3Michael Stahnke2011-05-181-0/+20
* | | | | | | | | | | | | | | Merge branch 'tickets/2.7.x/7259' into 2.7.xPieter van de Bruggen2011-05-182-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | (#7259) Remove ActiveRecord requirement from indirector face specJacob Helwig2011-05-181-2/+11
| * | | | | | | | | | | | | | | (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-181-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | / Adding a sleep state post starting masterDominic Maraglia2011-05-171-0/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'tickets/2.7.x/7507' into 2.7.xPieter van de Bruggen2011-05-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | (#7507) Add more filters for Ruby 1.9 spec failuresPieter van de Bruggen2011-05-172-2/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.xMatt Robinson2011-05-1763-189/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | (#7507) Add ability to filter Ruby 1.9 spec failuresMatt Robinson2011-05-1759-102/+102
| * | | | | | | | | | | | | | (#7507) Fix when_invoked action specs in Ruby 1.9Matt Robinson2011-05-174-87/+86
* | | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/7297' into 2.7.xNick Lewis2011-05-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9Nick Lewis2011-05-161-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/7298' into 2.7.xNick Lewis2011-05-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |