summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* (#8660) Default config dir to %PROGRAMDATA% on WindowsJosh Cooper2011-07-293-4/+7
* Merge branch 'ticket/master/8663-windows-spec-tests'Josh Cooper2011-07-286-11/+11
|\
| * (#8663) Disable spec tests for unsupported functionality on WindowsJosh Cooper2011-07-286-11/+11
|/
* Merge branch 'ticket/master/8663-windows-spec-tests'Josh Cooper2011-07-276-10/+13
|\
| * (#8663) Drive letters are not valid absolute paths on WindowsJosh Cooper2011-07-271-3/+2
| * (#8663) Update the run_mode spec test on Windows to match the codeJosh Cooper2011-07-271-3/+7
| * (#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
* | Merge branch 'ticket/master/8392-disable-master-tests-on-windows'Jacob Helwig2011-07-272-2/+2
|\ \
| * | (#8392) Disable master related tests on WindowsJacob Helwig2011-07-272-2/+2
* | | Merge branch 'ticket/master/8272'Nick Lewis2011-07-262-67/+77
|\ \ \ | |/ / |/| |
| * | (#8272) Allow disabled Windows services to be startedNick Lewis2011-07-262-0/+40
| * | (#8272) Refactor specs for Windows service providerNick Lewis2011-07-261-58/+32
| * | (#8272) Use symbols instead of booleans for enabled property on WindowsNick Lewis2011-07-262-4/+4
| * | (#8272) Fixup logging in Windows service providerNick Lewis2011-07-261-7/+3
* | | Merge branch '2.7.x'Jacob Helwig2011-07-268-17/+193
|\ \ \ | |/ / |/| |
| * | Merge branch 'tickets/2.7.x/5777' into 2.7.xJacob Helwig2011-07-268-17/+193
| |\ \
| | * | Deprecate RestAuthConfig#allowed? in favor of #check_authorizationBrice Figureau2011-07-264-4/+9
| | * | Fix #6026 - security file should support inline commentsBrice Figureau2011-07-265-15/+26
| | * | Fix #5010 - Allow leading whitespace in auth.confBrice Figureau2011-07-263-1/+14
| | * | Fix #5777 - rule interpolation broke auth.conf CIDR rulesBrice Figureau2011-07-261-0/+147
| |/ /
* | | Merge branch 'master' of github.com:puppetlabs/puppetJosh Cooper2011-07-264-38/+62
|\ \ \
| * | | Merge branch '2.7.x'Matt Robinson2011-07-264-38/+62
| |\| |
| | * | Merge branch 'ticket/2.7.x/maint-show_help_for_cert_without_subcommand' into ...Matt Robinson2011-07-262-1/+12
| | |\ \
| | | * | maint: Fix cert app to print help and exit if no subcommandMatt Robinson2011-07-252-1/+12
| | * | | Merge branch 'ticket/2.7.x/maint-improve_ssl_error' into 2.7.xMatt Robinson2011-07-262-37/+50
| | |\ \ \
| | | * | | maint: Suggest where to start troubleshooting SSL error messageMatt Robinson2011-07-262-37/+50
| | |/ / /
* | | | | Merge branch 'feature/master/8268-puppet-agent-windows'Josh Cooper2011-07-2622-75/+81
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | 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
| |/ / / /