summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util
Commit message (Expand)AuthorAgeFilesLines
...
| * (#5466) Monkey patch Symbol so that you can sort themMatt Robinson2011-02-281-0/+3
| * Merge remote branch 'brice/tickets/2.6.x/6267' into 2.6.nextJesse Wolfe2011-02-252-0/+57
| |\
| | * Fix #6267 - puppetdoc embedded links to puppet entities are not hyperlinkedBrice Figureau2011-02-122-0/+57
| * | (#6499) Make puppet respond identically to -h and --helpnfagerlund2011-02-251-1/+1
| * | Maint: Add an assertion mechanism to PuppetPaul Berry2011-02-231-0/+18
| * | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-142-6/+5
| |\ \
| | * | (#3646) Fix the documentation fix for `puppet apply --apply`Jacob Helwig2011-02-142-6/+5
| * | | Merge branch '2.6.x' into 2.6.nextJacob Helwig2011-02-142-8/+9
| |\| |
| | * | Updated fix for #3646 - apply / compile documentationJames Turnbull2011-02-142-8/+9
| * | | Merge branch 'masterzen/tickets/2.6/5720' into bug/2.6.next/5720-puppetdoc-fa...Daniel Pittman2011-02-121-3/+5
| |\ \ \ | | |/ / | |/| |
| | * | Fix #6281 - Make sure puppetdoc analyzes all filesBrice Figureau2011-02-111-1/+3
| | * | Fix #6280 - puppetdoc crashing on string interpolationBrice Figureau2011-02-111-2/+2
| | |/
| * | Merge remote branch 'dan/ticket/2.6.4/5977' into 2.6.nextJesse Wolfe2011-02-081-2/+6
| |\ \ | | |/ | |/|
| | * (5977) Puppet::Applications can be loaded from multiple paths.Dan Bode2011-01-141-2/+6
* | | Revert #5691 "Merge remote branch 'brice/feature/process-instrumentation' int...Jesse Wolfe2011-03-012-141/+0
* | | Merge remote branch 'brice/feature/process-instrumentation' into nextJesse Wolfe2011-02-252-0/+141
|\ \ \
| * | | Process name instrumentation infrastructureBrice Figureau2010-12-182-0/+141
* | | | Merge branch '2.6.x' into nextNick Lewis2011-02-031-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'bug/2.6.next/5755-gc-issue' into 2.6.nextPaul Berry2011-02-031-0/+2
| |\ \ \
| | * | | Fix for #5755 -- making zaml serialization robust over projected objectsMarkus Roberts2011-02-031-0/+2
* | | | | Merge branch 'maint/2.6.next/help' into nextJesse Wolfe2011-02-0312-921/+8
|\ \ \ \ \
| * | | | | Maint: move puppet resource --helpJesse Wolfe2011-02-031-89/+0
| * | | | | Maint: move puppet kick --helpJesse Wolfe2011-02-031-126/+0
| * | | | | Maint: move puppet queue --helpJesse Wolfe2011-02-031-53/+0
| * | | | | Maint: move puppet doc --helpJesse Wolfe2011-02-031-67/+0
| * | | | | Maint: move puppet cert --helpJesse Wolfe2011-02-031-110/+0
| * | | | | Maint: move puppet apply --helpJesse Wolfe2011-02-031-69/+0
| * | | | | Maint: move puppet describe --helpJesse Wolfe2011-02-031-48/+0
| * | | | | Maint: move puppet filebucket --helpJesse Wolfe2011-02-031-97/+0
| * | | | | Maint: move puppet master --helpJesse Wolfe2011-02-031-74/+0
| * | | | | Maint: move puppet agent --helpJesse Wolfe2011-02-031-188/+0
| |/ / / /
| * / / / (#4139) hook log autoflush into global defaultsDaniel Pittman2011-02-032-0/+8
| |/ / /
* | | | Merge branch '2.6.x' into nextMatt Robinson2011-02-027-22/+36
|\| | |
| * | | Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextMarkus Roberts2011-02-015-20/+12
| |\ \ \
| | * \ \ Merge remote branch 'james/tickets/2.6.x/5916' into 2.6.nextJesse Wolfe2011-02-012-12/+3
| | |\ \ \
| | | * | | Fixes #5916 - Cleanup of unused doc methods and documentationJames Turnbull2011-01-172-12/+3
| | * | | | Merge remote branch 'james/tickets/2.6.x/5914' into 2.6.nextJesse Wolfe2011-02-011-1/+1
| | |\ \ \ \
| | | * | | | Fixed #5914 Removed genconfig = true from genconfig outputJames Turnbull2011-01-201-1/+1
| | | |/ / /
| | * | | | Merge remote branch 'jamtur01/tickets/2.6.x/5736' into 2.6.nextJacob Helwig2011-02-011-2/+2
| | |\ \ \ \
| | | * | | | Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate d...nfagerlund2011-01-171-2/+2
| | | |/ / /
| | * | | | Merge remote branch 'james/tickets/2.6.x/5742' into 2.6.nextJesse Wolfe2011-02-011-5/+6
| | |\ \ \ \
| | | * | | | Fixed #5742 - Removed legacy fqdn option from documentationJames Turnbull2011-01-171-5/+6
| | | |/ / /
| * | / / / Fix to fix for #5755 -- backref serialization issues in zamlMarkus Roberts2011-02-011-27/+25
| |/ / / /
| * | | | Merge commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694' into 2.6.nextJacob Helwig2011-02-011-1/+2
| |\ \ \ \
| | * | | | Fixed #4968 - Updated list of options turned on by --test in documentationJames Turnbull2011-02-011-1/+2
| | |/ / /
| * | | | Merge branch 'issues/2.6.next/5566' into 2.6.nextJacob Helwig2011-02-011-1/+13
| |\ \ \ \
| | * | | | (#5566) Treat source only File checksums as syntax errors when used with contentJacob Helwig2011-02-011-1/+13
| * | | | | Merge remote branch 'jamtur01/tickets/2.6.x/3646' into 2.6.nextPaul Berry2011-02-011-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed #3646 - Added documentation for compile and apply to man pageJames Turnbull2011-01-211-0/+9
| | |/ / /
| * / / / Bug #5755 -- ZAML generates extra newline in some hash backreferences.Daniel Pittman2011-01-311-4/+3
| |/ / /