summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | (#2728) Add diff output for changes made by Augeas providerMichael Knox2011-06-022-18/+148
| |/ / / /
* | | | | Merge branch '2.7.x'Max Martin2011-06-0253-691/+1322
|\| | | |
| * | | | Merge branch '2.7rc' into 2.7.xMax Martin2011-06-0218-275/+347
| |\| | |
| | * | | Merge branch 'bug/2.7rc/7746-fix-broken-master-start' into 2.7rcDaniel Pittman2011-06-011-9/+62
| | |\ \ \
| | | * | | (#7746) Fix bootstrap issues from #7717 fix.Daniel Pittman2011-06-011-9/+62
| | |/ / /
| | * | | Merge branch 'feature/2.7rc/7683-man-face-with-ronn-support' into 2.7rcDaniel Pittman2011-06-013-3/+99
| | |\ \ \
| | | * | | (#7683) Use ronn, when available, to render the output.Daniel Pittman2011-06-011-0/+48
| | | * | | (#7683) Add a 'man' face and subcommand to Puppet.Daniel Pittman2011-06-012-0/+51
| | | * | | maint: remove obsolete work-around code from help face.Daniel Pittman2011-06-011-3/+0
| | |/ / /
| | * | | (#7699) Don't duplicate inherited action names on faces.Daniel Pittman2011-06-012-13/+42
| | * | | Merge branch 'refactor/2.7rc/7717-deprecate-puppet-apply-by-magic' into 2.7rcDaniel Pittman2011-06-011-5/+33
| | |\ \ \
| | | * | | (#7177) Deprecate implicit 'puppet apply' for 2.7.0Daniel Pittman2011-06-011-2/+24
| | | * | | (#7717) Layout cleanup for subcommand extraction.Daniel Pittman2011-06-011-5/+11
| | |/ / /
| | * | | Merge branch 'bug/2.7rc/7211-unhelpful-help-for-common-cases' into 2.7rcDaniel Pittman2011-05-313-11/+58
| | |\ \ \
| | | * | | #7211: Test unknown options don't shadow unknown actions.Daniel Pittman2011-05-311-0/+11
| | | * | | #7211: nasty logic error with global Face options taking arguments.Daniel Pittman2011-05-311-1/+1
| | | * | | #7211: more helpful error messages in various cases.Daniel Pittman2011-05-313-10/+46
| | |/ / /
| | * | | Merge branch 'ticket/2.7rc/7708-reorganize-config-refs' into 2.7rcnfagerlund2011-05-273-101/+48
| | |\ \ \
| | | * | | (#7708) Delete extended documentation from configuration referencenfagerlund2011-05-271-101/+26
| | | * | | (#7707) Document signals in puppet agent and puppet master helpnfagerlund2011-05-272-0/+22
| | |/ / /
| | * | | add puppet master polling step for ticket 7117Dominic Maraglia2011-05-271-2/+10
| | * | | (#5318) Always notice changes to manifests when compiling.Daniel Pittman2011-05-271-5/+9
| | * | | Merge branch 'ticket/2.7rc/7557-remove_faces_application' into 2.7rcMatt Robinson2011-05-262-136/+0
| | |\ \ \
| | | * | | (#7557) Remove Faces ApplicationMatt Robinson2011-05-262-136/+0
| | |/ / /
| | * | | Merge branch 'ticket/2.7rc/maint-faces_docs_spec_fixes' into ticket/2.7rc/mai...Matt Robinson2011-05-268-32/+43
| | |\ \ \
| | | * | | maint: Fix order dependent spec failure for face indirectionMatt Robinson2011-05-261-1/+2
| | | * | | (#7690) Don't blow up when listing terminuses available for facesMatt Robinson2011-05-264-24/+25
| | | * | | maint: Dedup the loadpath so we don't have to walk it multiple timesMatt Robinson2011-05-262-3/+3
| | | * | | Maint: Fix ellipses for short descriptionsnfagerlund2011-05-262-3/+12
| | * | | | (#7563) DRY: Remove indirector boilerplate from individual facesnfagerlund2011-05-2612-113/+0
| | * | | | (#7564) Finish templatesnfagerlund2011-05-265-60/+270
| | * | | | (#7561) Complete help text for all faces and actionsnfagerlund2011-05-2622-257/+628
| | * | | | Maint: Add ellipsis to generated short_descriptions.nfagerlund2011-05-261-1/+1
| | * | | | (#6962) Add "arguments" method to help APInfagerlund2011-05-261-0/+2
| | |/ / /
| * | | | Merge branch '2.6.x' into 2.7.xMax Martin2011-06-021-5/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'bug/2.6.x/5318-minimal-fix' into 2.6.xDaniel Pittman2011-05-271-5/+9
| | |\ \ \
| | | * | | (#5318) Always notice changes to manifests when compiling.Daniel Pittman2011-05-271-5/+9
| | |/ / /
| | * | | Merge branch 'ticket/2.6.x/7681' into 2.6.xNick Lewis2011-05-261-0/+27
| | |\ \ \
| | | * | | (#7681) Add an acceptance test for resource refs with array variablesNick Lewis2011-05-261-0/+27
| | |/ / /
| * | | | maint: Fix order dependent test failureJosh Cooper2011-05-311-0/+1
| * | | | Merge branch 'ticket/2.7.x/5966-auth-conf-hostname-regex' into 2.7.xJosh Cooper2011-05-312-9/+49
| |\ \ \ \
| | * | | | (#5966) Add support for hostname regular expressions in auth.confSiim Põder2011-05-312-9/+49
| |/ / / /
| * | | | Merge branch 'ticket/2.7.x/maint-faces_docs_spec_fixes' into 2.7.xMatt Robinson2011-05-266-28/+30
| |\ \ \ \
| | * | | | maint: Fix order dependent spec failure for face indirectionMatt Robinson2011-05-261-1/+2
| | * | | | (#7690) Don't blow up when listing terminuses available for facesMatt Robinson2011-05-264-24/+25
| | * | | | maint: Dedup the loadpath so we don't have to walk it multiple timesMatt Robinson2011-05-262-3/+3
| * | | | | Merge branch '2.7rc' into 2.7.xNick Lewis2011-05-263-6/+47
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Merge branch 'ticket/2.7rc/7681' into 2.7rcNick Lewis2011-05-263-6/+47
| | |\ \ \
| | | * | | (#7681) Add an acceptance test for resource refs with array variablesNick Lewis2011-05-261-0/+27
| | | * | | (#7681) Allow array variables as resource referencesNick Lewis2011-05-262-6/+20
| | |/ / /