summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-10-05Imported Upstream version 2.7.5upstream/2.7.5Stig Sandbeck Mathisen465-6331/+7320
2011-08-16Merge commit '2.7.3' into upstreamupstream/2.7.3Stig Sandbeck Mathisen232-2886/+7281
2011-08-15Update changelog for 2.7.3Michael Stahnke1-4/+1
2011-08-06Increment lib/puppet.rb VERSION stringMichael Stahnke1-1/+1
2011-08-05Updated CHANGELOG for 2.7.3rc1Michael Stahnke1-6/+60
2011-08-05Merge branch '2.7.x' into 2.7rcMichael Stahnke92-355/+2486
2011-08-04Merge pull request #21 from daniel-pittman/bug/2.7.x/4762-ensure-that-clients...Nick Lewis1-1/+1
2011-08-04(#4762) Ensure that clients on the moon can successfully connect.Daniel Pittman1-1/+1
2011-08-02Add document outlining preferred contribution methodsJacob Helwig1-0/+299
2011-08-02Add document outlining preferred contribution methodsJacob Helwig1-0/+299
2011-08-02Revert "Merge branch 'vcsrepo'"Jacob Helwig7-763/+0
2011-08-02Revert "Merge branch 'vcsrepo'"Jacob Helwig7-763/+0
2011-07-29Merge branch '2.7rc' into 2.7.xMichael Stahnke1-0/+4
2011-07-29Updating CHANGELOG for 2.7.2rc3Michael Stahnke1-0/+4
2011-07-29Merge branch 'ticket/2.7.x/8704-fileserverconf_parse_errors' into 2.7.xMatt Robinson2-0/+35
2011-07-29(#8704) Give better errors for invalid fileserver.confMatt Robinson2-0/+35
2011-07-28Merge branch 'tickets/2.7.x/1886' into 2.7.xPieter van de Bruggen2-112/+115
2011-07-28(Maint.) Disable cleaning of storeconfigs.Pieter van de Bruggen2-112/+115
2011-07-28(#8690) Accept 'global' options in Puppet FacesDaniel Pittman2-1/+9
2011-07-28Merge branch 'tickets/2.7.x/1886' into 2.7.xPieter van de Bruggen1-0/+2
2011-07-28(Maint.) Fix spec failures related to leaking state.Pieter van de Bruggen1-0/+2
2011-07-28Merge branch 'feature/2.7.x/1886' into 2.7.xPieter van de Bruggen9-37/+518
2011-07-28(#1886) Clean up `node clean` for merge.Pieter van de Bruggen5-138/+139
2011-07-27Fix #1886 - Add node cleanup capabilityPeter Meier7-20/+500
2011-07-26Merge branch 'tickets/2.7.x/5777' into 2.7.xJacob Helwig8-17/+193
2011-07-26Deprecate RestAuthConfig#allowed? in favor of #check_authorizationBrice Figureau4-4/+9
2011-07-26Fix #6026 - security file should support inline commentsBrice Figureau5-15/+26
2011-07-26Fix #5010 - Allow leading whitespace in auth.confBrice Figureau3-1/+14
2011-07-26Fix #5777 - rule interpolation broke auth.conf CIDR rulesBrice Figureau1-0/+147
2011-07-26Merge branch 'ticket/2.7.x/maint-show_help_for_cert_without_subcommand' into ...Matt Robinson2-1/+12
2011-07-26Merge branch 'ticket/2.7.x/maint-improve_ssl_error' into 2.7.xMatt Robinson2-37/+50
2011-07-26maint: Suggest where to start troubleshooting SSL error messageMatt Robinson2-37/+50
2011-07-25Merge branch '2.6.x' into 2.7.xNick Lewis7-18/+80
2011-07-25Merge branch 'ticket/2.6.x/8596' into 2.6.xNick Lewis2-10/+60
2011-07-25(#8596) Detect resource alias conflicts when titles do not matchNick Lewis2-10/+60
2011-07-25maint: Fix cert app to print help and exit if no subcommandMatt Robinson2-1/+12
2011-07-25Merge branch 'tickets/2.7.x/7293' into 2.7.xPieter van de Bruggen3-20/+16
2011-07-25(#7293) Set default format for SSL-related faces.Pieter van de Bruggen3-11/+7
2011-07-25(Maint.) Unquoting HEREDOCs.Pieter van de Bruggen2-9/+9
2011-07-25Merge branch '2.7rc' into 2.7.xMichael Stahnke11-35/+604
2011-07-25Updated CHANGELOG for 2.7.2rc2Michael Stahnke1-0/+5
2011-07-25Merge branch 'ticket/2.6.x/8418-inspect_respect_run_mode' into 2.6.xMatt Robinson5-8/+20
2011-07-25(#8418) Fix inspect app to have the correct run_modeMatt Robinson2-2/+10
2011-07-25maint: Adding logging to include environment when source failsMatt Robinson1-1/+1
2011-07-25maint: Add debug logging when the master receives a reportMatt Robinson2-5/+9
2011-07-25Merge branch 'tickets/2.7.x/7266' into 2.7.xPieter van de Bruggen3-18/+29
2011-07-25(#7266) Move Certificate option validation into face.Pieter van de Bruggen3-18/+29
2011-07-25maint: Fix Face testing bug 1.9.2 revealed.Daniel Pittman2-4/+2
2011-07-22Merge branch 'refactor/2.7.x/8561-and-7290-improved-option-handling' into 2.7.xDaniel Pittman4-51/+109
2011-07-22(#7290) Update indirected Faces to avoid unknown options.Daniel Pittman2-5/+17