summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Readying for release of 2.6.9Michael Stahnke2011-06-212-30/+5
* Merge branch 'tickets/2.6rc/6854' of git://jet.mox.net/~tmz/puppet into 2.6rcMichael Stahnke2011-06-151-23/+88
|\
| * (#6854) Update Red Hat spec fileTodd Zullinger2011-06-151-23/+88
|/
* Bumping release in lib/puppet.rb and updating CHANGELOG.Michael Stahnke2011-06-142-1/+70
* Bumping RPM spec file to 2.6.9rc1.stahnma2011-06-141-1/+4
* Merge branch '2.6.x' into 2.6rcstahnma2011-06-143-44/+31
|\
| * Merge branch 'ticket/2.6.x/7506' into 2.6.xnfagerlund2011-06-142-41/+17
| |\
| | * (#7506) Organize READMEs; specify supported Ruby versions in README.mdnfagerlund2011-06-142-41/+17
| |/
| * Merge branch 'ticket/2.6.x/6418' into 2.6.xDominic Maraglia2011-06-101-3/+14
|/|
| * (#6418) Make test 64118 more portableDominic Maraglia2011-06-101-3/+14
* | Merge branch 'ticket/2.6.x/7127-prerun-command-failures-dont-stop-puppet' int...Josh Cooper2011-06-108-131/+210
|\ \ | |/ |/|
| * (#7127) Stop puppet if a prerun command failsJosh Cooper2011-06-107-121/+198
| * Do not needlessly create multiple reports when creating a transactionJosh Cooper2011-06-103-10/+12
* | Merge branch 'ticket/2.6.x/4416' into 2.6.xNick Lewis2011-06-104-44/+97
|\|
| * (#4416) Ensure types are providified after reloadingNick Lewis2011-06-102-0/+12
| * (#4416) Always remove old provider before recreating itNick Lewis2011-06-102-14/+71
| * Cleanup indentation, comment, and unused codeNick Lewis2011-06-102-30/+14
|/
* Merge branch 'ticket/2.6.x/2128_docstrings' into 2.6.xJeff McCune2011-06-081-7/+17
|\
| * (#2128) Add WARNING for node_name_{fact,value} descriptionsJeff McCune2011-06-081-7/+7
| * (#2128) Whitespace only reflow commitJeff McCune2011-06-081-19/+17
| * (#2128) In-line docs for node_name_{fact,value}Jeff McCune2011-06-081-2/+14
|/
* Merge branch 'ticket/2.6.x/650' into 2.6.xNick Lewis2011-06-073-0/+32
|\
| * (#650) Allow symlinks for configuration directoriesNick Lewis2011-06-073-0/+32
|/
* Fix acceptance tests not managing their mastersNick Lewis2011-06-062-37/+22
* Merge branch 'ticket/2.6.x/2128' into 2.6.xNick Lewis2011-06-0615-433/+624
|\
| * (#2128) Add support for setting node name based on a factNick Lewis2011-06-069-3/+150
| * (#2128) Get facts before retrieving catalogNick Lewis2011-06-062-23/+22
| * (#2128) Add the ability to specify a node nameNick Lewis2011-06-0612-16/+81
| * maint: Refactor specs in preparation for making node name more flexibleNick Lewis2011-06-024-413/+393
* | (#7193) Fix path issues with acceptance tests that call old shell testsMatt Robinson2011-06-062-2/+2
* | Merge branch 'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-t...Ben Hughes2011-06-032-2/+2
|\ \ | |/ |/|
| * (#6885) puppet agent fingerprint requires --verbose to return a value.Ben Hughes2011-06-032-2/+2
* | 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
|/ /
* | Merge branch 'test/2.6.x/4123' into 2.6.xDominic Maraglia2011-05-242-51/+36
|\ \
| * | (4123) Fix test for 4123/4 on old egrep in cent4Dominic Maraglia2011-05-242-51/+36
|/ /
* | Merge branch '2.6.next' into 2.6.xPieter van de Bruggen2011-05-183-8/+8
|\ \
| * | Merge branch 'ticket/2.6.next/3836' into 2.6.nextMax Martin2011-05-133-8/+8
|/| |
| * | (#3836) External nodes should only capture stdoutOliver Hookins2011-05-133-8/+8
|/ /
* | Merge branch '2.6.next' into 2.6.xDaniel Pittman2011-05-1229-103/+457
|\ \
| * | adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| * | Merge branch 'ticket/2.6.next/7139' into 2.6.nextNick Lewis2011-05-032-1/+8
| |\ \
| | * | (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| |/ /
| * | Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into 2.6....Max Martin2011-04-283-1/+172
| |\ \
| | * | vim: Initial ftplugin and indent supportTodd Zullinger2011-04-023-1/+172
| * | | Merge branch 'ticket/2.6.next/6844' into 2.6.nextMax Martin2011-04-281-2/+1
| |\ \ \
| | * | | case seems needless here as there is only two opts, also the rest of the file...ben hengst2011-04-281-2/+1
| |/ / /
| * | | Merge branch 'ticket/2.6.x/6845' into 2.6.nextJames Turnbull2011-04-281-1/+1
| |\ \ \