summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* (4123) Fix test for 4123/4 on old egrep in cent4Dominic Maraglia2011-05-242-51/+36
* Merge branch '2.6.next' into 2.6.xPieter van de Bruggen2011-05-183-8/+8
|\
| * Merge branch 'ticket/2.6.next/3836' into 2.6.nextMax Martin2011-05-133-8/+8
|/|
| * (#3836) External nodes should only capture stdoutOliver Hookins2011-05-133-8/+8
|/
* Merge branch '2.6.next' into 2.6.xDaniel Pittman2011-05-1229-103/+457
|\
| * adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| * Merge branch 'ticket/2.6.next/7139' into 2.6.nextNick Lewis2011-05-032-1/+8
| |\
| | * (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| |/
| * Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6....Max Martin2011-04-283-1/+172
| |\
| | * vim: Initial ftplugin and indent supportTodd Zullinger2011-04-023-1/+172
| * | Merge branch 'ticket/2.6.next/6844' into 2.6.nextMax Martin2011-04-281-2/+1
| |\ \
| | * | case seems needless here as there is only two opts, also the rest of the file...ben hengst2011-04-281-2/+1
| |/ /
| * | Merge branch 'ticket/2.6.x/6845' into 2.6.nextJames Turnbull2011-04-281-1/+1
| |\ \
| | * | (#6845) Mount writes incorrect vfstab entriesStefan Schulte2011-04-281-1/+1
| |/ /
| * | Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into 2.6....Matt Robinson2011-04-272-3/+3
| |\ \
| | * | (#6442) Be able to start agents --listen without namespaceauth.confMatt Robinson2011-04-272-3/+3
| |/ /
| * | 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 '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
| | | |/ / | | |/| |
* | | | | Update CHANGELOG for 2.6.8Jacob Helwig2011-04-271-2/+5
* | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
* | | | | Move tests from puppet-acceptance repoDominic Maraglia2011-04-2092-0/+2045
| |_|/ / |/| | |
* | | | Updated CHANGELOG for 2.6.8rc1Max Martin2011-04-132-1/+47
* | | | Merge branch '2.6.next' into 2.6.xMax Martin2011-04-1312-101/+292
|\| | |
| * | | Merge branch 'ticket/2.6.x/7082' into 2.6.nextNick Lewis2011-04-134-3/+33
| |\ \ \
| | * | | Fixed #7082 - Added system support for groupsJames Turnbull2011-04-144-3/+33
| |/ / / |/| | |
| * | | Merge branch 'tickets/2.6.x/2331-macports-provider' into 2.6.nextNigel Kersten2011-04-133-86/+228
| |\ \ \
| | * | | (#2331) Remove darwinports pkg provider, replace with rewritten macports prov...Nigel Kersten2011-04-133-86/+228
| |/ / / |/| | |
| * | | Merge branch 'ticket/2.6.next/7018-clarify_service_type_behavior' into 2.6.nextnfagerlund2011-04-111-11/+19
| |\ \ \
| | * | | (#7018) Give more context on the service type's assumptions. Wording tweaks.nfagerlund2011-04-111-14/+19
| | * | | (#7018) explain internals better in service provider documentationBen Hughes2011-04-111-1/+4
| |/ / /
| * | | Merge branch 'ticket/2.6.next/maint-fix_sqlite_test' into 2.6.nextMatt Robinson2011-04-111-1/+5
| |\ \ \
| | * | | maint: Fix sqlite3 require to really be optionalMatt Robinson2011-04-111-1/+4
| | * | | maint: Fix sporadic sqlite errorMatt Robinson2011-04-111-0/+1
| |/ / /
| * | | Merge branch 'ticket/2.6.next/6818-named_scope_deprecation' into 2.6.nextMatt Robinson2011-04-111-0/+5
| |\ \ \
| | * | | (#6818) Stop from getting Rails 3 named_scope deprecation warningMatt Robinson2011-04-111-0/+5
| |/ / /