summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove Puppet::Util::Cacher usage from Puppet::Util::SettingsNick Lewis2011-07-212-16/+3
* Remove Util::Cacher usage from SSL::CertificateAuthorityNick Lewis2011-07-213-9/+9
* Remove unused require 'puppet/util/cacher' from Network::HttpPoolNick Lewis2011-07-211-1/+0
* Remove use of Util::Cacher from FileServing::Mount::FileNick Lewis2011-07-213-182/+172
* Remove use of Util::Cacher in FileServing::ConfigurationNick Lewis2011-07-216-49/+35
* Merge branch '2.7.x'Nick Lewis2011-07-2043-157/+1028
|\
| * Replace calls to Array#count with #lengthNick Lewis2011-07-201-2/+2
| * Fix order-dependent test failure in certificate_status/file specNick Lewis2011-07-201-0/+4
| * Merge branch 'feature/2.7.x/6789-port-ca-interface-to-faces' into 2.7.xDaniel Pittman2011-07-204-0/+595
| |\
| | * (#6789) Port SSL::CertificateAuthority::Interface to a FaceDaniel Pittman2011-07-203-0/+593
| | * maint: SSL::Inventory.serial should report missing names.Daniel Pittman2011-07-201-0/+2
| |/
| * (#7204) Consolidate Semantic Versioning code.Pieter van de Bruggen2011-07-195-80/+266
| * Merge branch 'issue/2.7.x/7699' into 2.7.xDan Bode2011-07-155-3/+23
| |\
| | * (#7699) Help command should only list options onceDan Bode2011-07-135-3/+23
| * | Merge branch 'ticket/2.7.x/8401-docs-detailed-exitcodes' into 2.7.xnfagerlund2011-07-153-11/+12
| |\ \
| | * | (#8401) Document that --detailed-exitcodes is a bitmasknfagerlund2011-07-153-11/+12
| |/ /
| * | Merge branch '2.6.x' into 2.7.xMatt Robinson2011-07-1420-50/+83
| |\ \
| | * \ Merge branch 'maint/2.6.x/replace_regex_with_asserts' into 2.6.xDominic Maraglia2011-07-1415-45/+68
| | |\ \
| | | * | (maint) Cleanup and strengthen acceptance testsDominic Maraglia2011-07-1415-45/+68
| | * | | Merge branch 'ticket/2.6.x/7144-private-keys' into 2.6.xMatt Robinson2011-07-143-2/+12
| | |\ \ \ | | | |/ / | | |/| |
| | | * | (#7144) Update Settings#writesub to convert mode to FixnumMax Martin2011-07-143-2/+12
| | |/ /
| | * | Merge branch 'maint/2.6.x/fix_plaform_detection' into 2.6.xDominic Maraglia2011-07-122-3/+2
| | |\ \
| | | * | (maint) Fix platform dection for RHELDominic Maraglia2011-07-122-3/+2
| | |/ /
| * | | Merge branch 'ticket/2.7.x/maint-fix_doc_link' into 2.7.xMatt Robinson2011-07-141-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | maint: Fix documentation link for fileserver configurationMatt Robinson2011-07-141-1/+1
| |/ /
| * | Merge branch 'ticket/2.7.x/4142-metadata_json' into 2.7.xMatt Robinson2011-07-122-10/+42
| |\ \
| | * | (#4142) Fix module check not to fail when empty metadata.jsonMatt Robinson2011-07-122-10/+42
| |/ /
| * | Revert "Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into ...Jeff McCune2011-07-104-21/+2
| * | Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.7.xJeff McCune2011-07-104-2/+21
| |\ \
| | * | (#7699) - Help should only show options onceDan Bode2011-07-104-2/+21
| |/ /
| * | Merge branch 'ticket/2.7.x/8032_create_resource_containment' into 2.7.xJeff McCune2011-07-101-5/+6
| |\ \
| | * | (#8032) Add containment to create_resourcesJeff McCune2011-07-101-5/+6
| |/ /
| * | Merge branch 'ticket/2.7.x/8147' into 2.7.xnfagerlund2011-06-292-2/+2
| |\ \
| | * | (#8147) Update test for default reporturlnfagerlund2011-06-291-1/+1
| | * | (#8147) Change default reporturl to match newer Dashboard versionsnfagerlund2011-06-291-1/+1
| |/ /
* | | Merge branch 'remove-http-pool-keep-alive'Nick Lewis2011-07-197-182/+4
|\ \ \
| * | | Remove Puppet::Network::HttpPool keep_alive handlingNick Lewis2011-07-197-182/+4
* | | | Merge branch 'feature/master/8268-puppet-agent-windows'Josh Cooper2011-07-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix spec test failure on 1.9.2Josh Cooper2011-07-191-1/+1
|/ / /
* | | Merge branch 'feature/master/8268-puppet-agent-windows'Josh Cooper2011-07-1996-325/+459
|\ \ \
| * | | Maint: Fix miscellaneous testsJosh Cooper2011-07-196-3/+12
| * | | Maint: Don't test for extended signals on WindowsJosh Cooper2011-07-191-1/+3
| * | | Maint: Tagged spec tests that are known to fail on WindowsJosh Cooper2011-07-1953-73/+73
| * | | Fix tests with "relative" paths on WindowsJosh Cooper2011-07-1941-233/+347
| * | | (#8268) Require windows drive letters in absolute file pathsJosh Cooper2011-07-194-6/+13
| * | | (#8489) Consistently use File::PATH_SEPARATORJosh Cooper2011-07-195-9/+11
|/ / /
* | | Merge branch 'refactor/master/8232-array_indexers_on_scope'Luke Kanies2011-07-1527-313/+436
|\ \ \
| * | | Scope[] now returns nil for undefined variablesLuke Kanies2011-07-156-30/+35
| * | | Fixing a failing test because of mismatched error stringLuke Kanies2011-07-151-1/+1
| * | | Removing an unnecessary stub in the Scope testsLuke Kanies2011-07-151-1/+5