summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | (#5823) run mode can now be set dynamically...Daniel Pittman2011-02-032-3/+48
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'ticket/2.6.next/6114' into 2.6.nextnfagerlund2011-02-031-6/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | (6114) Update the audit metaparameter for 2.6.5.nfagerlund2011-02-031-6/+19
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'bug/2.6.next/4139-autoflush-doesn't' into 2.6.nextDaniel Pittman2011-02-035-1/+31
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | (#4139) hook log autoflush into global defaultsDaniel Pittman2011-02-035-1/+31
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'next'Matt Robinson2011-02-0266-267/+765
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch '2.6.x' into nextMatt Robinson2011-02-0266-267/+765
| |\| | | | | | | | |
| | * | | | | | | | | Merge branch '2.6.next' into 2.6.xMatt Robinson2011-02-0268-298/+844
| | |\| | | | | | | | | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextMarkus Roberts2011-02-0116-39/+74
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge remote branch 'bodepd/feature/2.6.4/5910' into 2.6.nextPaul Berry2011-02-012-2/+15
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | (#5910) Improved logging when declared classes cannot be found:Dan Bode2011-01-122-2/+15
| | | | | | |_|/ / / / | | | | | |/| | | | |
| | | | * | | | | | | Merge branch 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet into 2....Jacob Helwig2011-02-012-2/+28
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | (#5913) Fix Puppet::Application.find constant lookup behaviorMitchell Hashimoto2011-01-162-2/+28
| | | | | | |_|_|_|/ / | | | | | |/| | | | |
| | | | * | | | | | | Merge remote branch 'james/tickets/2.6.x/5916' into 2.6.nextJesse Wolfe2011-02-015-20/+8
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fixes #5916 - Cleanup of unused doc methods and documentationJames Turnbull2011-01-175-20/+8
| | | | | |/ / / / / /
| | | | * | | | | | | 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/6071' into 2.6.nextJacob Helwig2011-02-011-2/+2
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fixed #6071 - Fixed typo and improved exec path error messageJames Turnbull2011-01-301-2/+2
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | | | * | | | | | | Merge branch 'tickets/2.6.x/5564' into 2.6.nextPaul Berry2011-02-011-3/+6
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fixed #5564 - Added some more fqdn_rand documentationJames Turnbull2011-02-011-3/+6
| | | | * | | | | | | | Merge remote branch 'james/tickets/2.6.x/6002' into 2.6.nextJesse Wolfe2011-02-011-0/+4
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fixed #6002 - Added note about function executionJames Turnbull2011-01-251-0/+4
| | | | * | | | | | | | | 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 branch 'tickets/2.6.x/5167' into 2.6.nextMatt Robinson2011-02-011-2/+2
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fixed #5167 - misleading documentation in the defaults of [main]James Turnbull2011-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
| | | | | |/ / / / / / / /
| | | * | | | | | | | | | Merge branch 'bug/2.6.next/5755-yaml-backrefs' into 2.6.nextMarkus Roberts2011-02-012-29/+57
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Augmentation of tests for prior commitMarkus Roberts2011-02-011-1/+7
| | | | * | | | | | | | | | Fix to fix for #5755 -- backref serialization issues in zamlMarkus Roberts2011-02-012-28/+50
| | | |/ / / / / / / / / /
| | | * / / / / / / / / / Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.nextMarkus Roberts2011-02-0154-232/+715
| | |/| | | | | | | | | | | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge remote branch 'jamtur01/tickets/2.6.x/1657' into 2.6.nextJacob Helwig2011-02-011-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fixed #1657 - Added note about target fileJames Turnbull2011-01-171-1/+1
| | | | |/ / / / / / / /
| | | * | | | | | | | | Merge branch 'ticket/2.6.next/3165' into 2.6.nextPaul Berry2011-02-012-21/+9
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Fix #3165 Ralsh (bin/puppet resource) can't manage filesJesse Wolfe2011-01-232-21/+9
| | | | |/ / / / / / /
| | | * | | | | | | | 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 'feature/master/5061' into 2.6.nextPaul Berry2011-02-012-13/+35
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | (#5061) - allow special hostclass/define variables to be evaluated as defaults.Dan Bode2011-02-012-13/+35
| | | * | | | | | | | | Merge branch 'ticket/2.6.next/5045' into 2.6.nextMatt Robinson2011-02-014-15/+147
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | (#5045) Cleaning up some tests and codeMatt Robinson2011-01-244-40/+69
| | | | * | | | | | | | | (#5045) External node classifiers should be able to specify params for classesDan Bode2011-01-242-3/+73
| | | | * | | | | | | | | (#5045) Adds support to resource/type to also accept a param hashDan Bode2011-01-242-3/+36
| | | * | | | | | | | | | Merge branch 'tickets/2.6.x/2096' into 2.6.nextMatt Robinson2011-02-011-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Fixed #2096 - clarified option modification and tested it is workingJames Turnbull2011-01-171-2/+2
| | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Merge branch 'ticket/2.6.next/6107' into 2.6.nextMatt Robinson2011-02-013-0/+63
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | (#6107) Fix an error when auditing a file with empty contentMatt Robinson2011-02-013-0/+63
| | | * | | | | | | | | | Merge branch 'issues/2.6.next/5566' into 2.6.nextJacob Helwig2011-02-011-2/+0
| | | |\ \ \ \ \ \ \ \ \ \