summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updating CHANGELOG for 2.7.2rc3Michael Stahnke2011-07-291-0/+4
* Updated CHANGELOG for 2.7.2rc2Michael Stahnke2011-07-251-0/+5
* Merge branch 'ticket/master/8301-redhat-spec-cleanup' into 2.7rcJacob Helwig2011-07-141-7/+40
|\
| * (#8301) Red Hat spec file for 2.7.2rc1 won't workMichael Stahnke2011-07-141-7/+40
|/
* (#5108) Update service type docs for new hasstatus defaultnfagerlund2011-07-141-24/+20
* Updated CHANGELOG and package building files for 2.7.2rc1Michael Stahnke2011-07-065-6/+132
* Merge branch 'master' into 2.7rcMichael Stahnke2011-07-065-0/+409
|\
| * Merge branch '2.7.x'Jacob Helwig2011-06-281-2/+2
| |\ | |/ |/|
* | Update configurer_spec.rb to work with Ruby 1.8.5Jacob Helwig2011-06-281-2/+2
| * Merge branch '2.7.x'Jacob Helwig2011-06-2857-388/+779
| |\ | |/ |/|
* | Merge branch '2.6.x' into 2.7.xJacob Helwig2011-06-2846-317/+587
|\ \
| * \ Merge branch '2.6rc' into 2.6.xJacob Helwig2011-06-282-30/+5
| |\ \
| | * | Readying for release of 2.6.9Michael Stahnke2011-06-212-30/+5
| * | | Merge branch 'ticket/2.6.x/7956' into 2.6.xDominic Maraglia2011-06-275-30/+15
| |\ \ \
| | * | | (#7956) Porting cron testsDominic Maraglia2011-06-275-30/+15
| |/ / /
| * | | Merge branch 'maint/2.6.x/add_ported_resources_tests_from_enterpise_dist' int...Dominic Maraglia2011-06-2729-96/+119
| |\ \ \
| | * | | (#7956) Port resource acceptance testsDominic Maraglia2011-06-2729-96/+119
| |/ / /
| * | | Merge branch '2.6rc' into 2.6.xMichael Stahnke2011-06-151-23/+88
| |\| |
| | * | 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 'template-not-defined-test-failure-2.7.x' into 2.7.xJacob Helwig2011-06-282-7/+2
|\ \ \
| * | | Clean up indentation, whitespace, and commented out codeJacob Helwig2011-06-281-6/+1
| * | | Remove order dependency from functions integration specJacob Helwig2011-06-281-1/+1
|/ / /
* | | (#8048) Gem install puppet no longer fails if rdoc enabled.Josh Cooper2011-06-221-2/+1
* | | Merging up 2.7.1Michael Stahnke2011-06-224-50/+47
|\ \ \
| * | | Updating for 2.7.1 release.Michael Stahnke2011-06-222-1/+5
| * | | (#8048) Gem install puppet no longer fails if rdoc enabled.Michael Stahnke2011-06-221-2/+0
| * | | Updating CHANGELOG for 2.7.0Michael Stahnke2011-06-161-40/+34
| * | | (#7506) Specify supported Ruby versions in README.mdnfagerlund2011-06-141-2/+6
* | | | Merge branch 'ticket/2.7.x/7224' into 2.7.xNick Lewis2011-06-147-14/+128
|\ \ \ \
| * | | | (#7224) Reword 'hostname was not match' error messageNick Lewis2011-06-145-14/+97
| * | | | (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate namesNick Lewis2011-06-142-0/+31
* | | | | Merge branch 'ticket/2.7.x/5641' into 2.7.xnfagerlund2011-06-131-12/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | (#5641) Help text: document that puppet doc takes modulepath, manifestdir, an...nfagerlund2011-06-131-12/+23
|/ / / /
| | | * Merge branch 'template-not-defined-test-failure'Jacob Helwig2011-06-172-7/+2
| | | |\
| | | | * Clean up indentation, whitespace, and commented out codeJacob Helwig2011-06-171-6/+1