summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tickets/2.6.x/3127' into 2.6.nextJames Turnbull2011-04-051-1/+0
|\
| * Fixed #3127 - removed legacy debug codeJames Turnbull2011-04-051-1/+0
* | Merge branch 'tickets/2.6.x/3127' into 2.6.nextJames Turnbull2011-04-042-3/+14
|\|
| * Fixed #3127 - Fixed gem selection regexJames Turnbull2011-04-042-3/+14
* | Merge branch 'ticket/2.6.x/5437-report-manifest-errors-on-agent' into 2.6.nextJacob Helwig2011-04-014-16/+30
|\ \
| * | (#5437) Invalidate cached TypeCollection when there was an error parsingJacob Helwig2011-04-014-16/+30
* | | (#6937) Adjust formatting of recurse's descnfagerlund2011-04-011-9/+10
* | | (#6937) Document the recurse parameter of File type.Ben Hughes2011-04-011-1/+11
|/ /
* | Merge branch 'ticket/2.6.next/5670' into 2.6.nextNick Lewis2011-03-302-28/+35
|\ \ | |/ |/|
| * (#5670) Don't trigger refresh from a failed resourceNick Lewis2011-03-302-28/+35
|/
* Merge branch '2.6.next' into 2.6.xMax Martin2011-03-3038-528/+1874
|\
| * Merge branch 'ticket/2.6.next/5908-update-rc' into 2.6.nextMax Martin2011-03-302-4/+20
| |\
| | * (#5908) Add support for new update-rc.d disable APIMax Martin2011-03-302-4/+20
| * | Merge branch 'tickets/2.6.x/6862' into 2.6.nextJacob Helwig2011-03-281-1/+3
| |\ \ | | |/ | |/|
| | * (#6862) Add a default subject for the mail_patches rake taskBrice Figureau2011-03-261-1/+3
| |/ |/|
| * Merge branch 'tickets/2.6.x/6256' into 2.6.nextJames Turnbull2011-03-263-3/+4
| |\
| | * Fixed #6256 - Creation of rrd directory.James Turnbull2011-03-263-3/+4
| * | Merge branch 'ticket/2.6.next/5477' into 2.6.nextJesse Wolfe2011-03-259-28/+40
| |\ \
| | * | (#5477) Allow watch_file to watch non-existent files, especially site.ppJesse Wolfe2011-03-259-28/+40
| * | | Merge branch 'ticket/2.6.next/5221' into 2.6.nextNick Lewis2011-03-242-0/+9
| |\ \ \ | | |/ / | |/| |
| | * | (#5221) Add test for fix to fileset with trailing separatorNick Lewis2011-03-241-0/+8
| | * | (#5221) Fix fileset path absoluteness checking with trailing slashJames Turnbull2011-03-241-0/+1
| * | | Merge branch 'feature/2.6.next/4576' of https://github.com/bodepd/puppet into...Jesse Wolfe2011-03-242-3/+2
| |\ \ \
| | * | | (4576) - if ENC declares invalid class, it is logged at warning.Dan Bode2011-03-162-3/+2
| | | |/ | | |/|
| * | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-03-241-2/+3
| |\ \ \ | |/ / / |/| | |
* | | | Update CHANGELOG for 2.6.7Jacob Helwig2011-03-241-2/+3
| |/ / |/| |
| * | Merge branch 'ticket/2.6.next/4769' into 2.6.nextNick Lewis2011-03-242-10/+20
| |\ \
| | * | (#4769) Fix negative timeout support for newer rubiesNick Lewis2011-03-242-10/+20
| |/ /
| * | Merge branch 'tickets/2.6.x/6562' into 2.6.nextJames Turnbull2011-03-221-1/+0
| |\ \
| | * | Fixed #6562 - Minor kick documentation fixJames Turnbull2011-03-221-1/+0
| * | | Merge branch 'ticket/2.6.next/6658' into 2.6.nextMatt Robinson2011-03-182-5/+3
| |\ \ \
| | * | | (#6658) Propagate ENC connection errors to the agentMatt Robinson2011-03-182-5/+3
| |/ / / |/| | |
| * | | Merge branch 'ticket/2.6.x/5814' into 2.6.nextMax Martin2011-03-181-18/+466
| |\ \ \
| | * | | (#5814) Improved cron type specsStefan Schulte2011-01-091-17/+454
| | * | | (#5814) cron_spec shouldn't depend on cron providerStefan Schulte2011-01-091-1/+12
| | | |/ | | |/|
| * | | Merge branch 'ticket/2.6.next/maint-more-exec-testing' into 2.6.nextMax Martin2011-03-181-1/+1
| |\ \ \
| | * | | (#4884) Remove typo from spec testMax Martin2011-03-181-1/+1
| |/ / /
| * | | Merge branch 'ticket/2.6.next/maint-fix-exec-tests' into 2.6.nextMax Martin2011-03-182-75/+82
| |\ \ \
| | * | | (#4884) Modify tests to pass on non-OS X systemsMax Martin2011-03-182-75/+82
| |/ / /
| * | | Merge branch 'feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered...Max Martin2011-03-1715-434/+1279
|/| | |
| * | | (#4884) Revise new exec tests, add a few moreMax Martin2011-03-173-11/+22
| * | | (#4884) Add an shell provider for execsMatt Robinson2011-03-152-0/+61
| * | | (#4884) Fix Test::Unit exec testsMatt Robinson2011-03-151-176/+87
| * | | (#4884) Break the exec type out to have a posix providerDaniel Pittman2011-03-154-239/+841
| * | | (#4884) Add consistent path validation and behaviorDaniel Pittman2011-03-154-0/+253
| * | | (#4884) Add expand_path to requiring the spec_helperMatt Robinson2011-03-151-1/+1
| * | | (#4884) Autorequire shared behaviors and method to silence warningsDaniel Pittman2011-03-152-0/+15
| * | | (#4884) Fix whitespaceMatt Robinson2011-03-151-15/+9
| * | | (#4884) Get rid of open3 require since it wasn't being usedMatt Robinson2011-03-151-3/+1
* | | | Updated CHANGELOG for 2.6.7rc1Matt Robinson2011-03-162-2/+107