| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | Merge branch '2.7.x' into 2.7.next | Daniel Pittman | 2011-05-06 | 122 | -1028/+2737 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch '2.6.next' into 2.7.next | Max Martin | 2011-04-27 | 6 | -9/+120 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Merge branch 'tickets/2.6.next/3420' into 2.6.next | Josh Cooper | 2011-04-26 | 1 | -1/+9 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | (#3420) Nagios "name" attribute does not output correctly | Jim Pirzyk | 2011-04-26 | 1 | -1/+9 | |
| | | * | | | | | | | | | Merge branch 'tickets/2.6.next/4487' into 2.6.next | Josh Cooper | 2011-04-26 | 2 | -0/+15 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | (#4487) When setting environment on a host, ensure it is a string. | Josh Cooper | 2011-04-26 | 2 | -0/+15 | |
| | | * | | | | | | | | | | add test for ticket 7101 | Dominic Maraglia | 2011-04-26 | 1 | -0/+25 | |
| | | * | | | | | | | | | | Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-futur... | Jacob Helwig | 2011-04-22 | 2 | -8/+71 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | (#6487) Add some testing for OS X version support in DirectoryService provider | Jacob Helwig | 2011-04-22 | 1 | -0/+60 | |
| | | | * | | | | | | | | | (#6487) Directoryservice provider will fail in future OS releases | Gary Larizza | 2011-04-22 | 1 | -8/+11 | |
| | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branch 'tickets/2.7.next/7220' into 2.7.next | Pieter van de Bruggen | 2011-04-25 | 4 | -0/+125 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | (#7220) Add the ability to "inherit" options. | Pieter van de Bruggen | 2011-04-25 | 4 | -0/+125 | |
| | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branch 'tickets/2.7.next/6368-files-autorequire-nearest-ancestor-direct... | Jacob Helwig | 2011-04-22 | 2 | -2/+65 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | (#6368) Make the File type autorequire its nearest ancestor directory | Ian Ward Comfort | 2011-04-22 | 2 | -2/+65 | |
| | * | | | | | | | | | | | Merge branch '2.7.x' into 2.7.next | Max Martin | 2011-04-21 | 30 | -316/+532 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '2.6.next' into 2.7.next | Josh Cooper | 2011-04-21 | 95 | -0/+2087 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch 'maint/2.6.next/defined_type_has_two_parents' into 2.6.next | Jesse Wolfe | 2011-04-20 | 1 | -0/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Maint: Fix a #4655 introduced log inconsistency | Jesse Wolfe | 2011-04-20 | 1 | -0/+2 | |
| | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Move acceptance tests from puppet-acceptance repo | Dominic Maraglia | 2011-04-20 | 93 | -0/+2084 | |
| | | * | | | | | | | | | | | Merge branch 'ticket/2.6.next/7166' into 2.6.next | Josh Cooper | 2011-04-20 | 6 | -20/+20 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish" | James Turnbull | 2011-04-20 | 6 | -20/+20 | |
| | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Merge branch 'tickets/2.6.x/4655-parameterized-classes-default-stages' into 2... | Jacob Helwig | 2011-04-19 | 8 | -67/+151 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | (#4655) Allow stage to be set using a default class parameter | Jacob Helwig | 2011-04-19 | 6 | -66/+104 | |
| | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next | James Turnbull | 2011-04-14 | 1 | -0/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Fixed #6681 - Remove --force-yes option from aptitude is used | James Turnbull | 2011-03-12 | 1 | -0/+1 | |
| | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'ticket/2.7.next/7021-order_dependent_test_failure' into 2.7.next | Matt Robinson | 2011-04-21 | 4 | -37/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | (#7021) Fix order dependent spec failures | Matt Robinson | 2011-04-21 | 3 | -3/+12 | |
| | | * | | | | | | | | | | | | maint: Remove unused code | Matt Robinson | 2011-04-21 | 1 | -34/+0 | |
| | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge branch 'ticket/next/pson-ordering' into next | Max Martin | 2011-04-19 | 1 | -1/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | maint: Fix PSON order dependency in test | Max Martin | 2011-04-19 | 1 | -1/+6 | |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'jamtur01/tickets/master/7166' into next | Josh Cooper | 2011-04-19 | 6 | -20/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Fixed #7166 - Replaced deprecated stomp "send" method with "publish" | James Turnbull | 2011-04-20 | 6 | -20/+20 | |
| | * | | | | | | | | | | | | | Merge branch '2.7.x' into next | Jesse Wolfe | 2011-04-19 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tickets/2.7.x/4655-parameterized-classes-default-stages' into next | Jacob Helwig | 2011-04-19 | 6 | -64/+100 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | (#4655) Allow stage to be set using a default class parameter | Jacob Helwig | 2011-04-19 | 6 | -64/+100 | |
| * | | | | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/maint-stub_trap' into 2.7.x | Matt Robinson | 2011-05-19 | 4 | -8/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | maint: move trap call to Signal so we can stub it for specs | Matt Robinson | 2011-05-19 | 4 | -8/+2 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Updated CHANGELOG for 2.7.0rc3 | Michael Stahnke | 2011-05-18 | 1 | -0/+20 | |
| * | | | | | | | | | | | | | | | Merge branch 'tickets/2.7.x/7259' into 2.7.x | Pieter van de Bruggen | 2011-05-18 | 2 | -3/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | (#7259) Remove ActiveRecord requirement from indirector face spec | Jacob Helwig | 2011-05-18 | 1 | -2/+11 | |
| | * | | | | | | | | | | | | | | | (#7259) Do not try to load all Terminus classes when configuring the Indirector | Jacob Helwig | 2011-05-18 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | / | Adding a sleep state post starting master | Dominic Maraglia | 2011-05-17 | 1 | -0/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'tickets/2.7.x/7507' into 2.7.x | Pieter van de Bruggen | 2011-05-17 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | (#7507) Add more filters for Ruby 1.9 spec failures | Pieter van de Bruggen | 2011-05-17 | 2 | -2/+2 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.x | Matt Robinson | 2011-05-17 | 63 | -189/+188 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | (#7507) Add ability to filter Ruby 1.9 spec failures | Matt Robinson | 2011-05-17 | 59 | -102/+102 | |
| | * | | | | | | | | | | | | | | (#7507) Fix when_invoked action specs in Ruby 1.9 | Matt Robinson | 2011-05-17 | 4 | -87/+86 | |
| * | | | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/7297' into 2.7.x | Nick Lewis | 2011-05-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9 | Nick Lewis | 2011-05-16 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'ticket/2.7.x/7298' into 2.7.x | Nick Lewis | 2011-05-16 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
