Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.6.x' into next | Max Martin | 2011-04-07 | 15 | -85/+219 |
|\ | |||||
| * | Merge branch '2.6.next' into 2.6.x | Max Martin | 2011-04-07 | 24 | -74/+314 |
| |\ | |||||
| | * | Merge commit '647a640fcac281e3a8cda05b92b51c44c93f1d19' into 2.6.next | Nick Lewis | 2011-04-07 | 1 | -1/+3 |
| | |\ | |||||
| | | * | (#6893) Document the cron type in the case of specials. | Ben Hughes | 2011-03-31 | 1 | -1/+3 |
| | * | | Merge branch 'tickets/2.6.x/4339' into 2.6.next | Jacob Helwig | 2011-04-05 | 13 | -23/+215 |
| | |\ \ | |||||
| | | * | | Fix #4339 - Locally save the last report to $lastrunreport | Brice Figureau | 2011-04-05 | 7 | -0/+71 |
| | | * | | Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml | Brice Figureau | 2011-04-05 | 7 | -23/+144 |
| | |/ / | |||||
| | * | | Merge branch 'ticket/2.6.x/6554' of git://github.com/jamtur01/puppet into 2.6... | Jacob Helwig | 2011-04-04 | 1 | -2/+6 |
| | |\ \ | |||||
| | | * | | Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking R... | James Turnbull | 2011-03-02 | 1 | -2/+6 |
| | * | | | Merge branch 'tickets/2.6.x/3127' into 2.6.next | James Turnbull | 2011-04-05 | 1 | -1/+0 |
| | |\ \ \ | |||||
| | | * | | | Fixed #3127 - removed legacy debug code | James Turnbull | 2011-04-05 | 1 | -1/+0 |
| | * | | | | Merge branch 'tickets/2.6.x/3127' into 2.6.next | James Turnbull | 2011-04-04 | 2 | -3/+14 |
| | |\| | | | |||||
| | | * | | | Fixed #3127 - Fixed gem selection regex | James Turnbull | 2011-04-04 | 2 | -3/+14 |
| | * | | | | Merge branch 'ticket/2.6.x/5437-report-manifest-errors-on-agent' into 2.6.next | Jacob Helwig | 2011-04-01 | 4 | -16/+30 |
| | |\ \ \ \ | |||||
| | | * | | | | (#5437) Invalidate cached TypeCollection when there was an error parsing | Jacob Helwig | 2011-04-01 | 4 | -16/+30 |
| | * | | | | | (#6937) Adjust formatting of recurse's desc | nfagerlund | 2011-04-01 | 1 | -9/+10 |
| | * | | | | | (#6937) Document the recurse parameter of File type. | Ben Hughes | 2011-04-01 | 1 | -1/+11 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'ticket/2.6.next/5670' into 2.6.next | Nick Lewis | 2011-03-30 | 2 | -28/+35 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | (#5670) Don't trigger refresh from a failed resource | Nick Lewis | 2011-03-30 | 2 | -28/+35 |
| | |/ / / | |||||
| * | | | | (maint) Indentation fixes | Markus Roberts | 2011-04-06 | 2 | -15/+13 |
| * | | | | (#6490) Add plugin initialization callback system to core | Markus Roberts | 2011-04-06 | 3 | -5/+100 |
| |/ / / | |||||
* | | | | Merge branch 'feature/next/resource_application_order' into next | Markus Roberts | 2011-04-06 | 20 | -416/+424 |
|\ \ \ \ | |||||
| * | | | | (5200) -- replace containers with sentinals | Markus Roberts | 2011-04-06 | 15 | -283/+280 |
| * | | | | (6911) Cleanup and renaming of transaction internals | Markus Roberts | 2011-04-01 | 2 | -32/+15 |
| * | | | | (6911) Core change -- replace topsort with frontier ordered by salted SHA1 | Markus Roberts | 2011-04-01 | 3 | -19/+39 |
| * | | | | (6911) Add bookkeeping facade around Transaction#relationship_graph | Markus Roberts | 2011-04-01 | 1 | -1/+32 |
| * | | | | (6911) Cleanup of generate_additional_resources | Markus Roberts | 2011-03-31 | 2 | -10/+10 |
| * | | | | (6911) Refactor to localize eval_generate dependency assumptions | Markus Roberts | 2011-03-31 | 8 | -106/+89 |
| * | | | | (maint) Fix for require order issue | Markus Roberts | 2011-03-30 | 1 | -0/+1 |
| * | | | | (6911) Use normal methods to implement "depthfirst?" test | Markus Roberts | 2011-03-30 | 3 | -10/+4 |
* | | | | | (Maint) Fix uninitialized constant. | Pieter van de Bruggen | 2011-04-06 | 1 | -0/+1 |
* | | | | | Merge branch 'feature/master/5528-certificates_signing_api' into next | Max Martin | 2011-04-05 | 8 | -68/+502 |
|\ \ \ \ \ | |||||
| * | | | | | (#5528) Add REST API for signing, revoking, retrieving, cleaning certs | Max Martin | 2011-04-05 | 8 | -68/+502 |
* | | | | | | Merge commit 'ee1df783ddd4b72bd959735443b5dbdfea69e323' into next | James Turnbull | 2011-04-01 | 1 | -1/+11 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | (#6937) Document the recurse parameter of File type. | Ben Hughes | 2011-04-01 | 1 | -1/+11 |
|/ / / / / | |||||
* | | | | | Merge branch 'next' | Max Martin | 2011-03-30 | 75 | -228/+1952 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch '2.6.x' into next | Max Martin | 2011-03-30 | 6 | -8/+27 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch '2.6.next' into 2.6.x | Max Martin | 2011-03-30 | 38 | -528/+1874 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'ticket/2.6.next/5908-update-rc' into 2.6.next | Max Martin | 2011-03-30 | 2 | -4/+20 |
| | | |\ \ \ \ | |||||
| | | | * | | | | (#5908) Add support for new update-rc.d disable API | Max Martin | 2011-03-30 | 2 | -4/+20 |
| | | * | | | | | Merge branch 'tickets/2.6.x/6862' into 2.6.next | Jacob Helwig | 2011-03-28 | 1 | -1/+3 |
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | | * | | | | (#6862) Add a default subject for the mail_patches rake task | Brice Figureau | 2011-03-26 | 1 | -1/+3 |
| | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Merge branch 'tickets/2.6.x/6256' into 2.6.next | James Turnbull | 2011-03-26 | 3 | -3/+4 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixed #6256 - Creation of rrd directory. | James Turnbull | 2011-03-26 | 3 | -3/+4 |
| | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Merge branch 'ticket/2.6.next/5477' into 2.6.next | Jesse Wolfe | 2011-03-25 | 9 | -28/+40 |
| | | |\ \ \ \ | |||||
| * | | \ \ \ \ | Merge branch 'tickets/master/6494' of https://github.com/domcleal/puppet into... | Jesse Wolfe | 2011-03-29 | 2 | -0/+75 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | (#6494) Add setm command to Augeas provider | Dominic Cleal | 2011-02-25 | 2 | -0/+17 |
| | * | | | | | | | (#6494) Add mv command to Augeas provider | Dominic Cleal | 2011-02-25 | 2 | -0/+16 |
| | * | | | | | | | (#6494) Add defnode command to Augeas provider | Dominic Cleal | 2011-02-25 | 2 | -1/+15 |
| | * | | | | | | | (#6494) Add defvar command to Augeas provider | Dominic Cleal | 2011-02-25 | 2 | -0/+28 |