HomePhorge

Merge branch 'master' into puppet-4
06dca07ffda3Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into puppet-4

  • master: (PUP-2889) Bump win32-eventlog dependency to ~> 0.6.1 (maint) Require forwardable in puppet/settings.rb (maint) Use tlsv1 when curling in acceptance in general (maint) Use tlsv1 when curling the master from another agent (maint) Improve two test by checking they have no effect on catalog. (maint) Fix optimization that altered semantics for += production (perf) Speed up setting lookup (perf) Several small performance improvements (maint) Express language tests in puppet language (PUP-3054) Ensure that inherits are absolute (maint) Extract language specification tools (maint) Cleanup comment (PUP-2349) Add deprecation warning for non-string mode property values (PUP-2349) Specify mode as a string containing an octal mode (PUP-2349) Treat mode strings as octal (PUP-2924) Initialize resources from Type classes (PUP 229) Fix /etc/shadow parsing so that max/min_age is reported correctly (PUP-3050) Update cfacter option for recent cfacter gem changes. (PUP-1527) After upgrade from 3.3.2-1 to 3.4.2-1 naginator fails to create config from exported resources taken from hiera

Conflicts:
lib/puppet/defaults.rb

Retained masterlog removal from PUP-2953

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPU06dca07ffda3: Merge branch 'master' into puppet-4 (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).Aug 19 2014, 9:59 AM

Merged Changes