summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* (#8663) The ssh_authorized_key type is not supported on WindowsJosh Cooper2011-07-271-1/+1
* (#8663) Reenable spec tests on Windows that now passJosh Cooper2011-07-273-3/+3
* Fix issue with forward and backslashes in Windows pathsJosh Cooper2011-07-265-4/+13
* Disable spec tests for unsupported functionality on WindowsJosh Cooper2011-07-2610-27/+26
* Update certificate spec tests for WindowsJosh Cooper2011-07-267-44/+42
* Merge branch '2.7.x'Nick Lewis2011-07-2528-158/+405
|\
| * Merge branch '2.6.x' into 2.7.xNick Lewis2011-07-257-18/+80
| |\
| | * Merge branch 'ticket/2.6.x/8596' into 2.6.xNick Lewis2011-07-252-10/+60
| | |\
| | | * (#8596) Detect resource alias conflicts when titles do not matchNick Lewis2011-07-252-10/+60
| | |/
| | * Merge branch 'ticket/2.6.x/8418-inspect_respect_run_mode' into 2.6.xMatt Robinson2011-07-255-8/+20
| | |\
| | | * (#8418) Fix inspect app to have the correct run_modeMatt Robinson2011-07-252-2/+10
| | | * maint: Adding logging to include environment when source failsMatt Robinson2011-07-251-1/+1
| | | * maint: Add debug logging when the master receives a reportMatt Robinson2011-07-252-5/+9
| * | | Merge branch 'tickets/2.7.x/7293' into 2.7.xPieter van de Bruggen2011-07-253-20/+16
| |\ \ \
| | * | | (#7293) Set default format for SSL-related faces.Pieter van de Bruggen2011-07-253-11/+7
| | * | | (Maint.) Unquoting HEREDOCs.Pieter van de Bruggen2011-07-252-9/+9
| * | | | Merge branch '2.7rc' into 2.7.xMichael Stahnke2011-07-2511-35/+604
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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
| * | | | Merge branch 'tickets/2.7.x/7266' into 2.7.xPieter van de Bruggen2011-07-253-18/+29
| |\ \ \ \
| | * | | | (#7266) Move Certificate option validation into face.Pieter van de Bruggen2011-07-253-18/+29
| * | | | | maint: Fix Face testing bug 1.9.2 revealed.Daniel Pittman2011-07-252-4/+2
| |/ / / /
| * | | | Merge branch 'refactor/2.7.x/8561-and-7290-improved-option-handling' into 2.7.xDaniel Pittman2011-07-224-51/+109
| |\ \ \ \
| | * | | | (#7290) Update indirected Faces to avoid unknown options.Daniel Pittman2011-07-222-5/+17
| | * | | | maint: don't print inside action implementations.Daniel Pittman2011-07-221-3/+3
| | * | | | (#8561, #7290) Implement the option contract fully.Daniel Pittman2011-07-222-40/+55
| | * | | | (#8561) Unify validation and modification of action arguments.Daniel Pittman2011-07-222-10/+17
| | * | | | (#7290) Fail on unknown options.Daniel Pittman2011-07-221-0/+10
| | * | | | (#8561) Use canonical names for options to actions.Daniel Pittman2011-07-221-6/+20
| |/ / / /
| * | | | Merge branch 'feature/2.7.x/7184-better-action-loading' into 2.7.xDaniel Pittman2011-07-2210-19/+108
| |\ \ \ \
| | * | | | (#7184) Load the core of obsolete versions of Faces.Daniel Pittman2011-07-225-18/+61
| | * | | | (#7184) Find actions bound to other versions of Faces.Daniel Pittman2011-07-223-3/+31
| | * | | | (#7184) Centralize "find action for face" into Puppet::FaceDaniel Pittman2011-07-224-1/+18
| | * | | | maint: better error reporting when test failsDaniel Pittman2011-07-221-0/+1
* | | | | | Merge branch 'feature/master/8272-windows_service_support'Cameron Thomas2011-07-226-2/+261
|\ \ \ \ \ \
| * | | | | | Add basic service provider for WindowsCameron Thomas2011-07-225-1/+258
| * | | | | | Regexp escape substituted commands in Windows wrapper scriptCameron Thomas2011-07-221-1/+3
* | | | | | | Merge branch '2.7.x'Jacob Helwig2011-07-221-3/+13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '2.6.x' into 2.7.xJacob Helwig2011-07-221-3/+13
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'confine_shadow_acceptance_tests' into 2.6.xJacob Helwig2011-07-221-3/+13
| | |\ \ \ \
| | | * | | | Confine password disclosure acceptance test to hosts with required librariesJacob Helwig2011-07-221-3/+13
| | |/ / / /
* | | | | | Don't use non-1.8.5-compatible methods 'Object#tap' and 'Dir.mktmpdir'Nick Lewis2011-07-214-7/+12
* | | | | | Merge branch 'remove-cacher'Nick Lewis2011-07-2149-710/+350
|\ \ \ \ \ \
| * | | | | | Rework Puppet::Util::Cacher to only expire using TTLsNick Lewis2011-07-2116-269/+89
| * | | | | | Remove use of Puppet::Util::Cacher in Puppet::SSL::HostNick Lewis2011-07-214-46/+10
| * | | | | | Remove dead uses of Puppet::Util::Cacher from autoloaderNick Lewis2011-07-212-6/+0
| * | | | | | Remove Puppet::Util::Cacher use from Puppet::Indirector::IndirectionNick Lewis2011-07-213-9/+7
| * | | | | | Remove caching from the catalog, types, and parametersNick Lewis2011-07-216-85/+0