summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.6.x' into nextMax Martin2011-04-0715-85/+219
|\
| * Merge branch '2.6.next' into 2.6.xMax Martin2011-04-0724-74/+314
| |\
| | * Merge commit '647a640fcac281e3a8cda05b92b51c44c93f1d19' into 2.6.nextNick Lewis2011-04-071-1/+3
| | |\
| | | * (#6893) Document the cron type in the case of specials.Ben Hughes2011-03-311-1/+3
| | * | Merge branch 'tickets/2.6.x/4339' into 2.6.nextJacob Helwig2011-04-0513-23/+215
| | |\ \
| | | * | Fix #4339 - Locally save the last report to $lastrunreportBrice Figureau2011-04-057-0/+71
| | | * | Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yamlBrice Figureau2011-04-057-23/+144
| | |/ /
| | * | Merge branch 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet into 2.6...Jacob Helwig2011-04-041-2/+6
| | |\ \
| | | * | Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking R...James Turnbull2011-03-021-2/+6
| | * | | 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
| | |/ / /
| * | | | (maint) Indentation fixesMarkus Roberts2011-04-062-15/+13
| * | | | (#6490) Add plugin initialization callback system to coreMarkus Roberts2011-04-063-5/+100
| |/ / /
* | | | Merge branch 'feature/next/resource_application_order' into nextMarkus Roberts2011-04-0620-416/+424
|\ \ \ \
| * | | | (5200) -- replace containers with sentinalsMarkus Roberts2011-04-0615-283/+280
| * | | | (6911) Cleanup and renaming of transaction internalsMarkus Roberts2011-04-012-32/+15
| * | | | (6911) Core change -- replace topsort with frontier ordered by salted SHA1Markus Roberts2011-04-013-19/+39
| * | | | (6911) Add bookkeeping facade around Transaction#relationship_graphMarkus Roberts2011-04-011-1/+32
| * | | | (6911) Cleanup of generate_additional_resourcesMarkus Roberts2011-03-312-10/+10
| * | | | (6911) Refactor to localize eval_generate dependency assumptionsMarkus Roberts2011-03-318-106/+89
| * | | | (maint) Fix for require order issueMarkus Roberts2011-03-301-0/+1
| * | | | (6911) Use normal methods to implement "depthfirst?" testMarkus Roberts2011-03-303-10/+4
* | | | | (Maint) Fix uninitialized constant.Pieter van de Bruggen2011-04-061-0/+1
* | | | | Merge branch 'feature/master/5528-certificates_signing_api' into nextMax Martin2011-04-058-68/+502
|\ \ \ \ \
| * | | | | (#5528) Add REST API for signing, revoking, retrieving, cleaning certsMax Martin2011-04-058-68/+502
* | | | | | Merge commit 'ee1df783ddd4b72bd959735443b5dbdfea69e323' into nextJames Turnbull2011-04-011-1/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | (#6937) Document the recurse parameter of File type.Ben Hughes2011-04-011-1/+11
|/ / / / /
* | | | | Merge branch 'next'Max Martin2011-03-3075-228/+1952
|\ \ \ \ \
| * \ \ \ \ Merge branch '2.6.x' into nextMax Martin2011-03-306-8/+27
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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
| | | |\ \ \ \
| * | | \ \ \ \ Merge branch 'tickets/master/6494' of https://github.com/domcleal/puppet into...Jesse Wolfe2011-03-292-0/+75
| |\ \ \ \ \ \ \
| | * | | | | | | (#6494) Add setm command to Augeas providerDominic Cleal2011-02-252-0/+17
| | * | | | | | | (#6494) Add mv command to Augeas providerDominic Cleal2011-02-252-0/+16
| | * | | | | | | (#6494) Add defnode command to Augeas providerDominic Cleal2011-02-252-1/+15
| | * | | | | | | (#6494) Add defvar command to Augeas providerDominic Cleal2011-02-252-0/+28