[Pkg-puppet-devel] [SCM] Puppet packaging for Debian annotated tag, upstream/3.0.0_rc1, created. upstream/3.0.0_rc1

Stig Sandbeck Mathisen ssm at debian.org
Fri May 18 16:54:20 UTC 2012


The annotated tag, upstream/3.0.0_rc1 has been created
        at  7a12007c89b94eb3a47a5ccede8aa30182a4b1e3 (tag)
   tagging  9476790360848ad51c19231fcbe86a0dc729c80c (commit)
  replaces  upstream/2.7.14
 tagged by  Stig Sandbeck Mathisen
        on  Fri May 18 16:14:25 2012 +0200

- Shortlog ------------------------------------------------------------
Upstream version 3.0.0~rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAk+2WUEACgkQQONU2fom4u65XwCgt6RB3pO72BF6Ya+dmM36ORWY
f8EAn0ipiRa04NMiCMJE4BiKc+7QD+PN
=USWY
-----END PGP SIGNATURE-----

20after4 (1):
      Sleep for 5 seconds after enabling the service, but

Aditya Patawari (1):
      Fix for bug #9256. Get rid of error about missing sequence table while using postgresql for inventory service.

Adrien Thebo (1):
      (#8341) Remove duplicate loading of facter files.

Andrew Parker (51):
      Allow passing extra options to the execute
      Added doc of the command parameter
      Simple complete command wrapper for providers
      Puppet::Provider constructs Command objects
      Deprecated make_command_methods
      Delegate all commands to Puppet::Provider::Command
      Documented commands
      Unit test for Puppet::Provider dsl
      Added unit tests for Provider command DSL
      Added tests around suitability of provider
      Moved Puppet::Provider::Command
      Allow definition of commands via a dsl
      Cleanup of internals
      Deprecation points to has_command for substitute
      Removed unused code
      Removed text/marshal support
      Fix for bucket_path security vulnerability
      Removed text/marshal support
      Fix for bucket_path security vulnerability
      Fixup tests to work on CentOS 5
      Fixup tests to work on CentOS 5
      Increased test coverage of scoping rules
      Created test that shows enc warning problem
      Default autoflushing of log files to true
      Make sure the log file writable
      Fixed old log test to match new autoflush behavior
      Fixing problem caused by activerecord
      Cleaner test for create_resources doing nothing
      Removed duplication of compiling a catalog
      Merge remote-tracking branch 'upstream/2.7.x'
      Revert "Merge remote-tracking branch 'upstream/2.7.x'"
      Re-apply "Merge remote-tracking branch 'upstream/2.7.x'"
      Fixed problems caused by 2.7.x merge
      Removed topscope being overridden by node
      Evaluate node classes either in top or node scope
      Improve deprecation warning for dynamic lookup
      Removed unused methods
      Fixed error reporting when appending
      Removed dynamic scoping
      Moved full scoping tests to integrtion
      Fixed += op changing arrays in outer scope
      Added tests to cover old dynamic lookup
      Added tests around enc usage
      Removing use of deprecated execution methods
      Cleanup of the Forge code
      (#14387) Puppet's Module face should send a User-Agent
      Fix User-Agent for ruby 1.8.5
      Removed topscope being overridden by node
      Evaluate node classes either in top or node scope
      (#8174) Allow defines to reference topscope
      Merge remote-tracking branch 'upstream/2.7.x'

Ben Ford (1):
      Just fixed the indentation on a couple lines so the website doesn't use

Ben Hughes (1):
      (#12195) Fix future ruby warning messaves in process_name

Brice Figureau (28):
      Fix #7983 - Cisco uptime facts doesn't always work
      Fix #7984 - GigabitEthernet/TenGigabitEthernet are uncorrectly parsed
      Fix #7982 - puppet device doesn't reset all cached attributes
      Fix #9164 - allow '-' in device certificate names
      Fix device.conf error reporting
      Fix failing SSL Host test introduced by b6a67edc
      Fix #10066 - when fingerprinting, agent should not daemonize
      (#7004) Correctly form singular for indirections ending in 'es'
      (#6412) Return :undef when accessing non-existing hash/array elements
      (#10676) Include all resource statuses in reports regardless of count
      Add config and puppet version to the last run summary file
      (#7106) Obey specified owner, group, and permissions for last run summary file
      Instrumentation foundation layer
      Add indirection (REST usable) to manipulate instrumentation
      Add a way to add probe to puppet code
      Add the example 'log' listener
      Add the 'performance' instrumentation listener
      Process name instrumentation listener
      Add probe indirection for probe management
      Example probes for the indirector
      Set of faces to manage instrumentation listeners, data and probes
      Fix failing tests with ruby 1.9.2 in the instrumentation framework
      (#3757) - Move enable/disable to its own lock
      (#3757) - Refactor enable/disable to its own module
      (#4836) - Agent --disable should allow to put a message
      (#11990) Puppetdoc rdoc should also parse README.rdoc
      Refactor: configurer now returns report.exit_status
      Run the agent in a child process during catalog application

Bruno Léon (1):
      Add poller_tag, business_impact, realm attributes to nagios_types that supports them

Cameron Thomas (17):
      Regexp escape substituted commands in Windows wrapper script
      Add basic service provider for Windows
      Merge branch 'feature/master/8272-windows_service_support'
      Merge pull request #25 from nicklewis/feature/master/windows-users-and-groups
      (#8272) Add missing tests for Windows service provider methods.
      Regexp escape substituted commands in Windows wrapper script
      Add basic service provider for Windows
      (#8272) Add missing tests for Windows service provider methods.
      Merge pull request #123 from haus/ticket/2.7.x/catalog_spec_fix
      Merge pull request #112 from joshcooper/ticket/2.7.x/8410-waitpid2-on-windows
      Merge pull request #105 from joshcooper/ticket/2.7.x/9329-fix-daemonize-option-on-windows
      Merge pull request #109 from joshcooper/ticket/2.7.x/9435-log-destinations-on-windows
      (#9326) Support plaintext passwords in Windows 'user' provider.
      (#9459) Fix problems with Windows 'user' and 'group' providers.
      (#9328) Retrieve user and group SIDs on windows.
      Merge branch 'file-providers' of https://github.com/joshcooper/puppet into 2.7.x
      Fix problem with set_mode (chmod) behavior on different test environments.

Carl Caum (4):
      Merge pull request #231 from kelseyhightower/ticket/2.7.x/10940_deprecate_apply_for_catalog
      Retry inventory ActiveRecord transaction failure
      Retry inventory ActiveRecord transaction failure
      Properly call indirector when storing file content

Carla Souza (1):
      Bug #7140 fix

Chris Price (85):
      (#11860) Add parameter to control locale override
      (#11860) Fix unit test broken by previous commit
      (#11860) Add a (pending) acceptance test to check LANG during user "exec"s
      (#11860) Minor cleanup as per pull request comments
      (#11860) Fix specs that fail on windows
      (#5224) Unset USER-related env vars during execs
      moved posix-specific constants from Util to Util::POSIX
      (#12309) move execution-related methods from Util to Util::Execution
      (#12309) refactored all(?) deprecation warnings to use Puppet.deprecation_warning
      Minor improvement to backtrace logging
      Merge pull request #534 from cprice-puppet/feature/master/3324-yumrepo-ssl-options
      Merge pull request #538 from daniel-pittman/maint/2.7.x/test-failure-after-activerecord-cleanup
      Merge pull request #540 from cprice-puppet/bug/2.7.x/12844-agent-enable-doesnt-remove-old-lockfile
      Merge pull request #601 from cprice-puppet/master
      (#13397) fix gem provider ensure=>latest bug
      Merge branch '2.7.x'
      (#13584) in daemon mode, master can swallow errors during startup
      (#13588) fix permissions on log dir
      fix acceptance test that was relying on implicit 'apply'
      fix pluginsync acceptance tests
      Merge pull request #623 from kelseyhightower/ticket/2.7.x/13636_update_module_face_copyright_date
      cleanup whitespace, ala pull request #527
      Merge pull request #632 from cprice-puppet/cleanup/master/ssh_authorized_keys_whitespace
      Merge pull request #633 from cprice-puppet/bug/2.7.x/13567_fix_create_resources_name_param
      fix bug in Util#symbolizehash!
      Merge pull request #635 from cprice-puppet/bug/2.7.x/util_symbolize_hash
      Merge pull request #528 from stschulte/ticket/2.7.x/1076
      Merge pull request #535 from eshamow/tickets/master/7801_include_should_accept_arrays
      (#12396) dry up configtimeout usage
      Merge pull request #636 from cprice-puppet/refactor/master/12396-dry-up-timeout
      Merge pull request #598 from jeffweiss/ticket/master/4146_move_nagios_to_module
      Merge pull request #637 from zaphod42/bug/master/13655-test-failures-on-centos5
      Merge pull request #638 from zaphod42/bug/2.7.x/13655-test-failures-on-centos5
      (#13690) Update 2.7.x for spec_helper compatibility with external projects
      (#13690) add comments to spec_helper
      Merge pull request #661 from pcarlisle/maint/2.7.x/redhat-spec-windows-failure
      Merge pull request #663 from pcarlisle/maint/2.7.x/communication-error-test
      Fix console logging for no-daemonize mode
      Fix tempfile cleanup in specs
      (#13929) Improve logging for very early failures
      Merge pull request #671 from pcarlisle/ticket/2.7.x/13299-bad-disabled-error-message
      Merge pull request #662 from jeffweiss/ticket/2.7.x/13894_backport_fix_of_12191
      (#3757) re-introduce lockfile changes
      (#3757, #12934) Minor test improvement for agent disable message
      (#3757) separate settings for agent lockfile paths
      (#3757) move lockfile path logic into modules
      (#3757) Remove 'anonymous' functionality from lockfiles
      (#3757) rename AnonymousFilelock to JsonFilelock
      (#3757) Implement json-based lockfiles
      (#3757) cleanup and docs
      (#3757) add acceptance test
      Add ability to log spec test order to a file
      Merge pull request #712 from jeffweiss/ticket/master/13966_remove_name_option
      Merge pull request #711 from jeffweiss/maint/master/fix_acceptance_tests_for_windows
      (#14137) resource_type serialization naming conventions
      Merge pull request #721 from pcarlisle/file_terminus
      (#14200) Fix help face
      Cleanup some dumb tests in settings specs
      (#13429) refactor some settings initialization
      Merge pull request #745 from pcarlisle/maint/2.7.x/ansicolor_log_spec
      Fix windows acceptance failures (mostly related to tmpfile paths)
      Merge pull request #741 from pcarlisle/ticket/master/13341-nested-exceptions
      (#14200) Telly -> 2.7.x backward compatibility for app/face class names
      Merge pull request #757 from daniel-pittman/bug/2.7.x/10146-don't-allow-dash-in-variables
      (#14440) Hack to allow help faces to be used as API
      (#13559) added resource context to log messages when available
      Merge pull request #777 from pcarlisle/maint/2.7.x/fix_module_install_specs
      Merge pull request #780 from pcarlisle/maint/master/use-externalfileerror
      Fix failing spec tests for module tool
      Fix some windows acceptance failures
      Use internal domain name for module tool tests
      Merge pull request #782 from daniel-pittman/bug/master/3669-disable-srv-by-default
      More windows acceptance failure fixes
      Fix more windows acceptance failures
      Add "trace" for a couple of failing tests
      added another trace for debugging acceptance tests
      Merge pull request #791 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120516
      Merge pull request #790 from pcarlisle/maint/master/fail-is-bad
      Apply commit from master that varies ports during tests
      (#14440) Fix rake manpage generation in master
      Another windows acceptance failure fix
      Merge pull request #796 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120516
      Another (hopefully final) attempt to resolve the source_attribute test
      Merge pull request #797 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120516
      (#14440) Update outdated reference to puppetdoc

Christian G. Warden (1):
      Fix spelling of "whether"

Cody Herriges (2):
      (#5617)  Puppet queue logging
      (#11273) Updates init.pp.erb for style guide.

Dan Bode (2):
      Merge pull request #121 from djm68/9547_accectance_tests_cleanup_cfgs
      (#13888) Fix self.instances for systemd service provider

Daniel Pittman (580):
      Merge pull request #26 from nfagerlund/ticket/2.6.x/8302_exec_provider_docs
      Merge pull request #29 from nfagerlund/maint/2.7.x/minor_docs_fixes
      Merge pull request #28 from nfagerlund/ticket/2.6.x/3553_cron_requires_time
      Merge pull request #23 from domcleal/tickets/master/5606
      Merge pull request #22 from domcleal/tickets/2.7.x/8808
      Merge pull request #34 from nanliu/ticket/2.7.x/8814
      Merge pull request #39 from nfagerlund/ticket/2.7.x/8612_exec_creates_parameter
      Merge pull request #40 from jhelwig/fix-order-dependent-terminus-tests-in-2.7.x
      Merge pull request #41 from jhelwig/do-not-leak-indirector-state-2.6.x
      Merge pull request #43 from domcleal/tickets/2.7.x/9039
      Merge pull request #47 from nfagerlund/maint/2.7.x/create_resources_documentation
      maint: remove inaccurate copyright and license statements.
      (#9051) Add configuration around StoreConfigs indirection.
      (#9051) Implement the StoreConfigs indirection itself.
      (#9051) Get the compiler out of the ActiveRecord business.
      (#9051) Dead code elimination in the compiler terminus.
      (#9051) Whitespace cleanup for puppet/parser/collector
      (#9051) Make generic tagging imported resource origins.
      (#9051) Implement the `resource` terminus for StoreConfigs.
      (#9051) Port query tests into the indirection.
      Merge pull request #54 from nicklewis/ticket/2.7.x/8410
      Merge pull request #61 from jblaine/patch-1
      (#9051) de-ActiveRecord-ify Collection expressions.
      (#9051) Add configuration around StoreConfigs indirection.
      (#9051) Implement the StoreConfigs indirection itself.
      (#9051) Get the compiler out of the ActiveRecord business.
      (#9051) Dead code elimination in the compiler terminus.
      (#9051) Whitespace cleanup for puppet/parser/collector
      (#9051) Make generic tagging imported resource origins.
      (#9051) Implement the `resource` terminus for StoreConfigs.
      (#9051) Port query tests into the indirection.
      (#9051) de-ActiveRecord-ify Collection expressions.
      Merge pull request #62 from nicklewis/ticket/2.7.x/8489
      Merge branch '2.7.x' into feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      (#9051) Protect SQLite tests from running without gem.
      (#9051) More storeconfigs test cleanup.
      Save and restore indirector configuration around all tests.
      Merge pull request #78 from daniel-pittman/feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      More protection against accidentally using sqlite3
      One character typo, entire code path broken...
      Merge pull request #79 from daniel-pittman/feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      Don't toggle storeconfigs back and forth.
      Merge pull request #81 from daniel-pittman/feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      Merge pull request #83 from jamtur01/tickets/master/8119
      Revert "Fixes #8119 - Write to a temporary file and move when storing reports."
      Debug order-dependent test failures in CI / ActiveRecord.
      Merge pull request #86 from daniel-pittman/feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      (#9051) Move complex collect expression error into terminus.
      Fix ActiveRecord handling of symbols in query interpolation.
      Merge pull request #124 from daniel-pittman/bug/2.7.x/7991-and-4549-autoloading-for-custom-functions
      Resist directory traversal attacks through indirections.
      Resist directory traversal attacks through indirections.
      Resist directory traversal attacks through indirections.
      (#9794) k5login can overwrite arbitrary files as root
      (#9794) k5login can overwrite arbitrary files as root
      (#9794) k5login can overwrite arbitrary files as root
      (#9792) Predictable temporary filename in ralsh.
      (#9792) Predictable temporary filename in ralsh.
      (#9793) "secure" indirector file backed terminus base class.
      (#9793) "secure" indirector file backed terminus base class.
      (#9832) 2.7.4 StoreConfigs regression with PostgreSQL.
      (#9832) 2.7.4 StoreConfigs regression with PostgreSQL.
      (#9832) Test failures with some ActiveRecord versions.
      Resist directory traversal attacks through indirections.
      Merge pull request #147 from daniel-pittman/bug/2.7.x/9832-storeconfigs-postgresql-regression
      (#9832) General StoreConfigs regression.
      (#9832) General StoreConfigs regression.
      (#6928) Don't blow up when the method is undefined...
      (#2848) Set `certdnsnames` values into the CSR.
      (#2848) extract the subjectAltName value from the CSR.
      (#2848) Reject unknown (== all) extensions on the CSR.
      (#2848) Rewrite SSL Certificate Factory, fixing `subjectAltName` leak.
      (#2848) Use `certdnsnames` when bootstrapping a local master.
      (#2848) Rename `certdnsnames` to match new behaviour.
      (#2848) rename subject-alt-name option to dns-alt-names
      Wire up the `setbycli` slot in Puppet settings.
      (#2848) Migrate `dns-alt-names` back to settings.
      (#2848) Only mark `subjectAltName` critical if `subject` is empty.
      (#2848) Don't enable `emailProtection` for server keys.
      (#2848) Don't strip the subjectAltName label when listing.
      (#2848) Consistently use `subject_alt_names` as accessor name.
      (#2848) Consistent return values from `subject_alt_names` accessors.
      (#2848) Eliminate redundant `master_dns_alt_names`.
      s/not_to/should_not/ for older versions of RSpec 2.
      Add `lines` alias for `each_line` in Ruby 1.8.5.
      Ruby 1.8.5 compatibility changes in tests and code.
      (#2848) Config options require '_', not '-'.
      Better 1.8.5 compatible implementation of `lines`.
      More 1.8.5 compatibility fixes.
      (#6928) backport Symbol#to_proc for Ruby < 1.8.7
      (#6928) Don't blow up when the method is undefined...
      (#2848) Set `certdnsnames` values into the CSR.
      (#2848) extract the subjectAltName value from the CSR.
      (#2848) Reject unknown (== all) extensions on the CSR.
      (#2848) Rewrite SSL Certificate Factory, fixing `subjectAltName` leak.
      (#2848) Use `certdnsnames` when bootstrapping a local master.
      (#2848) Rename `certdnsnames` to match new behaviour.
      (#2848) rename subject-alt-name option to dns-alt-names
      Wire up the `setbycli` slot in Puppet settings.
      (#2848) Migrate `dns-alt-names` back to settings.
      (#2848) Only mark `subjectAltName` critical if `subject` is empty.
      (#2848) Don't enable `emailProtection` for server keys.
      (#2848) Don't strip the subjectAltName label when listing.
      (#2848) Consistently use `subject_alt_names` as accessor name.
      (#2848) Consistent return values from `subject_alt_names` accessors.
      (#2848) Eliminate redundant `master_dns_alt_names`.
      s/not_to/should_not/ for older versions of RSpec 2.
      Add `lines` alias for `each_line` in Ruby 1.8.5.
      Ruby 1.8.5 compatibility changes in tests and code.
      (#2848) Config options require '_', not '-'.
      Better 1.8.5 compatible implementation of `lines`.
      More 1.8.5 compatibility fixes.
      missing includes in network XML-RPC handlers
      missing includes in network XML-RPC handlers
      (#9508) Default ACL of `auth any` makes sense where we had `auth no`
      (#9508) Unify `auth no` and `auth any` in the system.
      (#9508) Be explicit is setting `auth any` for default ACLs.
      (#2744) Display file diffs through the Puppet log system.
      Merge pull request #198 from ody/feature/2.6.x/5617
      (#9158) Support old and new versions of STOMP gem.
      (#4865) Debug logging when we start evaluating resources.
      Merge pull request #238 from joshcooper/2.6.x
      Merge pull request #61 from jblaine/patch-1
      Merge pull request #250 from jeffmccune/ticket/2.7.x/11246_fix_utf8_string_to_yaml_bug
      Merge pull request #267 from mmrobins/maint/2.7.x/add_tap
      (#11423) Clearer error message about duplicate imported resources.
      Revert "(#11423) Clearer error message about duplicate imported resources."
      Merge pull request #278 from nfagerlund/ticket/2.7.x/11404-type-reference-indentation
      Merge pull request #279 from pcarlisle/tickets/2.7.x/7428-cert-ruby-1.9.2-issues
      Merge pull request #285 from jhelwig/disable-srv-lookup-by-default-in-tests
      Merge pull request #170 from xaque208/7296
      Merge pull request #299 from mmrobins/ticket/master/maint-fix_augeas_spec_merge
      Merge pull request #305 from pcarlisle/ticket/2.7.x/11741-certdnsnames-acceptance-tests
      Merge pull request #307 from djm68/11764_fix_cron_tests
      Merge pull request #92 from duritong/tickets/2.7.x/1886
      Merge pull request #127 from adrienthebo/ticket/2.7.x/8341-prevent_duplicate_loading_of_facts
      Merge pull request #324 from glarizza/bug/2.7.x/2273_launchd_dashw
      Merge pull request #327 from ripienaar/bug/2.6.x/5246
      Merge pull request #328 from glarizza/bug/2.7.x/3419_osx_groups
      Merge pull request #320 from joshcooper/ticket/2.7.x/11847-relocatable-puppet-bat
      Merge pull request #330 from pcarlisle/8341_facts_load_once
      Merge pull request #297 from nicklewis/ticket/2.7.x/11641
      Merge pull request #217 from domcleal/tickets/2.7.x/10807
      Merge pull request #222 from grimradical/tickets/master/7660_puppetqueue_init_script
      Whitespace damage cleanup on property.rb
      Finer-grained protocol for property `insync?`.
      (#2927) Support symbolic file modes.
      Merge pull request #331 from joshcooper/ticket/2.7.x/11929-serve-files-in-binary-mode
      Merge branch '2.6.x' into 2.7.x
      (#5246) Fix spec test expectations in 2.7.x branch
      Merge branch '2.7.x' into feature/master/merge-2.7.x-branch
      (#11727) Support STDIN for `puppet parser validate`
      Merge pull request #337 from kelseyhightower/ticket/2.7.x/11958_pip_provider_better_error_messages
      Merge pull request #333 from mmrobins/ticket/2.7.x/11802-puppet_module_list
      Merge pull request #338 from pcarlisle/ticket/2.7.x/freebsd-user-passwords
      Merge pull request #332 from kelseyhightower/ticket/2.7.x/11803_PMT_should_have_an_uninstall_command
      Merge pull request #298 from zsprackett/gitignore
      (#11803) Fix broken tests for uninstall action on module face
      (#11499) Better validation for IPv4 and IPv6 address in host type.
      Merge pull request #340 from jeffmccune/ticket/2.7.x/11888_revert_for_27
      Merge pull request #346 from mmrobins/ticket/2.7.x/11600_remove_module_face
      (#11996) Fix test failures due to hash processing order changes.
      Merge branch 'refactor/2.6.x/11996-spec-failures-after-ruby-187-p357' into refactor/2.7.x/11996-spec-failures-after-ruby-187-p357
      (#11996) Fix graph cycle reporting order after hash changes.
      (#11996) Fix file server recursion test after hash changes.
      (#11996) Fix file content test after hash changes.
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      (#11057) Note why a scheduled run was skipped in Puppet.
      Merge pull request #347 from daniel-pittman/bug/master/11888-better-provider-confines-for-rhel-family
      Merge pull request #345 from wu-lee/master
      Merge pull request #329 from daniel-pittman/feature/2.7.x/11727-support-stdin-parsing-in-puppet-parser-validate
      (#11727) Allocate a PTY when running the acceptance test.
      Merge pull request #354 from djm68/fix_test_3360_allow_duplicate_csr_with_option
      Merge pull request #356 from joshcooper/ticket/2.7rc/11767-remove-ssldir-cleaning
      Merge pull request #355 from pcarlisle/ticket/master/12060-remove-factsync
      Merge pull request #357 from pcarlisle/ticket/master/11858-consistent-plugin-paths
      Merge pull request #358 from pcarlisle/revert-11858
      Merge pull request #367 from fpletz/fix-9443
      Merge pull request #271 from nicklewis/ticket/2.7.x/6710
      Merge pull request #371 from nanliu/ticket/2.7.x/5353
      Merge pull request #360 from joshcooper/ticket/2.7.x/11930-forward-slashes
      Merge pull request #370 from fpletz/fix-9160
      (#6710) Fix Ruby 1.9.2 failures due to Array#to_s changes.
      Merge pull request #361 from stschulte/ticket/2.7.x/12070
      Merge pull request #362 from domcleal/tickets/2.7.x/12051
      Merge pull request #364 from domcleal/tickets/2.7.x/11961
      Merge pull request #372 from domcleal/tickets/2.7.x/11826
      Merge pull request #373 from lak/tickets/2.7.x/2056-launchd_supporting_stop_commands
      Merge branch 'codec-ticket/10907-logoutput-on-failure'
      Merge pull request #375 from carlasouza/master
      Merge pull request #376 from lak/tickets/2.7.x/6404-filebucket_fails_when_no_file_specified
      Merge pull request #384 from glarizza/bug/2.7.x/5445_create_varlib
      Merge pull request #394 from mmrobins/ticket/2.7.x/11600_put_module_face_back
      Merge pull request #395 from joshcooper/ticket/2.6.x/6541-use-the-same-filebucket
      Merge branch '2.7rc' into 2.7.x
      Merge branch '2.7.x'
      Merge pull request #399 from kelseyhightower/ticket/2.7.x/11804_enhance_search_action_output
      Merge pull request #400 from pcarlisle/ticket/2.7.x/12101-autoload-path
      Merge pull request #396 from jeffmccune/feature/2.7.x/12088_windows_build_tasks
      Merge pull request #401 from pcarlisle/backout-12101
      Merge pull request #404 from nicklewis/parser-resources-for-storeconfigs
      Document why we disable GC during the test runs.
      (#6771) Disconnect any ActiveRecord connection after every test.
      (#6771) Stop stubbing some feature tests.
      (#6771) Stop other AR connection handling.
      Merge pull request #407 from daniel-pittman/feature/2.7.x/8855-follow-http-redirects-in-mac-pkg-providers
      Merge pull request #380 from masterzen/tickets/2.7.x/11990
      Merge pull request #409 from MosesMendoza/ticket/12169_correct_redhat_spec_changelog_chronology
      Merge pull request #410 from nicholashubbard/patch-1
      Merge pull request #408 from cprice-puppet/bug/master/11860-LANG-environment-var
      Merge pull request #413 from stschulte/ticket/2.7.x/12197
      (#12188) Better handling of PID file cleanup warnings.
      (#12188) Handle Win32 as well as Unix in pidfile tests.
      (#12296) Test cycle detection on real Puppet::Type instances.
      (#12296) Make `Puppet::Type` ordered.
      (#12296) Now that `Puppet::Type` is ordered, use that.
      Make `Puppet::Provider` ordered.
      Use natural ordering of Puppet::Provider.
      (#12296) Acceptance test for cycle detection in graphs.
      Merge remote-tracking branch 'origin/2.7.x'
      (#11423) Better error when imported resources overlap.
      (#12268) String#each is not available in Ruby 1.9
      Merge pull request #419 from nicklewis/ticket/2.7.x/10064
      Merge pull request #418 from cprice-puppet/bug/master/5224-user-env-vars-during-Exec
      Merge pull request #272 from deanwilson/issues-7476
      Merge pull request #265 from jamtur01/tickets/master/10219
      Merge pull request #416 from kelseyhightower/ticket/master/8701_waitforcert_param_configurable_for_puppet_agent
      Merge pull request #431 from mmrobins/ticket/2.7.x/12329-faces_rendering_takes_args_and_options
      Merge pull request #432 from jeffmccune/ticket/2.7.x/12066_back_out_windows_build_tasks
      Merge pull request #427 from pcarlisle/ticket/master/12127-pluginsync-apply
      Merge pull request #179 from mkincaid/metricfu_config
      Merge pull request #429 from jeffweiss/ticket/master/11593_remove_support_for_os_x_10.4
      Merge pull request #273 from bleonsfl/shinken
      Merge pull request #300 from nfagerlund/ticket/2.7.x/11451_duplicate_definition_error
      Merge pull request #310 from nicklewis/fix-inherited-stages
      Merge pull request #313 from piavlo/yumrepo-fix-for-1.9.2
      Merge pull request #184 from seanmil/schedule/feature/10328-weekday
      Merge pull request #387 from ahpook/tickets-4426-regexp
      Merge pull request #433 from pcarlisle/ticket/2.7.x/12268-upstart
      Alternate, and portable, stubbing of execution for upstart spec.
      (#2927) Acceptance test for symbolic file modes.
      Property Spec cleanup: extract new subclass to let method.
      Property Spec cleanup: extract mock provider to let method.
      Property Spec cleanup: extract mock resource to let method.
      Property Spec cleanup: extract property instance to a let method.
      Property Spec cleanup: remove some pointless extra stubs.
      Property Spec cleanup: remove unused instance variable.
      Property Spec cleanup: extract more let methods.
      Property Spec cleanup: last let method extraction.
      Property Spec cleanup: eliminate stubbing of resource and provider.
      Add unit tests for the `insysc?` method of a property.
      Finer-grained protocol for property `insync?`.
      Fix bugs around the finer-grained insync? protocol.
      Restore compatible `insync?` behaviour for matching arrays.
      Merge pull request #438 from joshcooper/ticket/2.7.x/12363-use-tempfile
      Merge pull request #439 from pcarlisle/ticket/master/2244-plugin-mount-works-with-empty-directory
      Merge pull request #437 from cwarden/whether-typos
      Merge pull request #434 from tbielawa/master
      Merge pull request #440 from pcarlisle/ticket/master/5521-enable-pluginsync-by-default
      Merge pull request #435 from mmrobins/ticket/2.7.x/12349-module_list_dependencies
      Merge pull request #441 from nfagerlund/ticket/2.7.x/12356_hasstatus_exit_codes
      Merge pull request #443 from jeffweiss/ticket/2.7.x/12372_remove_duplicate_methods_from_certificate_request
      Merge pull request #391 from tdb/ticket/2.7.x/12081-missing-pw-userdel-flag
      Merge pull request #424 from jeffweiss/ticket/master/7792_allow_unless_as_replacement_for_if_not
      Merge pull request #82 from adimania/master
      Merge pull request #445 from lotheac/https-reporturl
      Symbolic file mode test fixes when no mode change happens.
      Merge pull request #449 from mmrobins/ticket/2.7.x/12349-order_module_list_output
      Merge pull request #232 from kscherer/ticket/2.7.x/7485-zypper-0.6-support
      (#12405) Remove obsolete storeconfig purging code.
      Merge pull request #453 from jeffweiss/ticket/master/12401_remove_files_that_should_have_been_removed_earlier
      Merge branch 'refactor/master/12399-don't-repeat-yourself'
      Merge pull request #454 from cprice-puppet/refactor/master/12309-posix-util-exec-cleanup
      Merge pull request #460 from cprice-puppet/refactor/master/12309-posix-util-exec-cleanup
      Merge pull request #461 from cprice-puppet/refactor/master/12309-posix-util-exec-cleanup
      (#12479) Don't make undef regexp match as the string undef.
      Merge remote-tracking branch 'origin/2.7.x'
      Merge pull request #463 from 20after4/ticket/master/4480-Sleep-5s-before-starting-runit-service
      Merge pull request #464 from kscherer/ticket/2.7.x/7485-zypper-0.6-support
      Merge pull request #465 from cprice-puppet/bug/master/12454-device_spec-ruby187-357
      Merge pull request #467 from pcarlisle/ticket/2.7.x/12464-puppet-apply-fact-loading
      Merge pull request #469 from grimradical/ticket/2.7.x/12452v2
      Merge pull request #476 from joshcooper/maint/master/test-fixes
      Merge pull request #473 from cprice-puppet/bug/master/12336-PATH-contains-tilde
      Merge pull request #474 from nfagerlund/ticket/2.7.x/11535_windows_provider_docs
      Merge pull request #477 from kelseyhightower/ticket/2.7.x/12244_centralize_forge_interation
      Merge pull request #456 from cprice-puppet/refactor/master/12359-improve-backtrace-logging
      Merge pull request #462 from lurkermike/master
      (#12457) add users primary group, not Process.gid, in initgroups
      Merge pull request #442 from pvande/tickets/2.7.x/12339-module-search-formatting
      Revert "(#12339) Clarifying source attribution."
      Revert "(#12339) Improving documentation around Puppet::Util::Terminal.width."
      Revert "(#12339) Adding basic search output formatting."
      Merge pull request #478 from cprice-puppet/bug/master/12490-execution_spec-sets-ENV
      Merge pull request #398 from kelseyhightower/ticket/2.7.x/12106_PMT_uninstall_command_ux_improvements
      Revert "(#12106) Enhance the uninstall PMT action for UX"
      Improve guidance for getting `puppet kick` to work.
      Merge pull request #481 from nfagerlund/doc/2.7.x/puppet-kick-howto-in-manpage
      Merge pull request #480 from cprice-puppet/feature/2.7.x/5454-pluginsync-features
      Facter 1.5.7 compatibility in the test condition.
      Merge pull request #484 from binford2k/master
      Merge pull request #486 from kelseyhightower/ticket/2.7.x/12106_PMT_uninstall_command_ux_improvements
      Merge pull request #491 from cprice-puppet/bugs/master/fix_stderr_acceptance_tests
      Merge pull request #490 from pcarlisle/ticket/2.7.x/12310-remove-process_name-listener
      (#12458) default to users primary group, not root, in `asuser`
      (#12459) drop supplementary groups when permanently dropping UID
      (#12463) add secure `replace_file` to Puppet::Util
      (#12462) user_role_add: use `replace_file` for /etc/shadow
      (#12460) use `replace_file` for the .k5login file
      (#12463) eliminate `secure_open` in favour of `replace_file`
      Whitespace cleanup on OpenBSD package provider.
      Add tests for the OpenBSD package provider.
      (#12564) Paste execpipe commands together with spaces.
      Merge pull request #487 from joshcooper/ticket/2.7.x/12412-root-user
      Merge pull request #495 from cprice-puppet/cleanup/master/deprecated-util-execution-message
      Merge pull request #493 from pvande/tickets/2.7.x/12080-telly-prototype-console
      Merge remote-tracking branch 'origin/2.7.x'
      Merge pull request #494 from joshcooper/ticket/2.7.x/12403-windows-default-log-destination
      Fix Rails compatibility code to be less stupid.
      Fix stubbing of ActiveRecord that doesn't work in AR 3.2.*
      Make PuppetSpec::Files methods available at module level.
      Clean up and unify scratch database setup logic.
      (#6663) Raise default key lengths in Puppet.
      Merge pull request #502 from cprice-puppet/bugs/master/fix_stderr_acceptance_tests
      Merge pull request #504 from mmrobins/ticket/2.7.x/12256-module_tool_core_changes
      Merge pull request #505 from mmrobins/maint/2.7.x/fix_range_monkey_patch_mistake
      Merge pull request #506 from mmrobins/ticket/2.7.x/12631-remove_puppet_module_face
      Merge pull request #512 from cprice-puppet/feature/master/improve-backtrace-logging
      (#12296) Test cycle detection on real Puppet::Type instances.
      (#12296) Make `Puppet::Type` ordered.
      (#12296) Now that `Puppet::Type` is ordered, use that.
      Make `Puppet::Provider` ordered.
      Use natural ordering of Puppet::Provider.
      (#12296) Acceptance test for cycle detection in graphs.
      (#2927) Acceptance test for symbolic file modes.
      Property Spec cleanup: extract new subclass to let method.
      Property Spec cleanup: extract mock provider to let method.
      Property Spec cleanup: extract mock resource to let method.
      Property Spec cleanup: extract property instance to a let method.
      Property Spec cleanup: remove some pointless extra stubs.
      Property Spec cleanup: remove unused instance variable.
      Property Spec cleanup: extract more let methods.
      Property Spec cleanup: last let method extraction.
      Property Spec cleanup: eliminate stubbing of resource and provider.
      Add unit tests for the `insysc?` method of a property.
      Fix bugs around the finer-grained insync? protocol.
      Restore compatible `insync?` behaviour for matching arrays.
      Merge pull request #509 from justinstoller/bug/2.6.x/12692-dont_hard_code_paths_in_tests
      (#12457) add users primary group, not Process.gid, in initgroups
      (#12458) default to users primary group, not root, in `asuser`
      (#12459) drop supplementary groups when permanently dropping UID
      (#12463) add secure `replace_file` to Puppet::Util
      (#12462) user_role_add: use `replace_file` for /etc/shadow
      (#12460) use `replace_file` for the .k5login file
      (#12463) eliminate `secure_open` in favour of `replace_file`
      Merge pull request #508 from pmorch/doc-for-apply-noop
      Merge pull request #241 from GregSutcliffe/pacman_aur_support
      Merge pull request #452 from daniel-pittman/bug/2.7.x/8435-openbsd-package-provider-broken-with-remote-packages
      Merge pull request #517 from mmrobins/maint/2.7.x/fix_enviornment_sort_spec_failure
      Symbolic file mode test fixes when no mode change happens.
      (#12564) Stub CHILDSTATUS in all test cases, not just failure cases.
      Merge pull request #5 from pcarlisle/ticket/2.7.x/12572-last-run-summary
      (#4862) Stop using EventLoop in the Puppet daemon.
      (#4862) `returning` is not a standard Ruby method.
      (#4862) define_method is not a public method in Ruby.
      (#4862) Finally remove the event-loop library.
      Merge pull request #518 from cprice-puppet/bug/master/7316-acceptance-tests
      Merge pull request #524 from cprice-puppet/bug/master/fix_backups_spec_test
      (#12188) Better handling of PID file cleanup warnings.
      (#12188) Handle Win32 as well as Unix in pidfile tests.
      Merge pull request #529 from joehillen/master
      Merge pull request #497 from daniel-pittman/bug/2.7.x/active-record-test-failures-with-3.2.1
      Merge pull request #516 from pcarlisle/ticket/master/12126-autoloader-reload
      Merge remote-tracking branch 'origin/2.7.x'
      Don't stub the database in Puppet::Rails tests.
      Merge pull request #533 from pcarlisle/ticket/master/12126-fix-test
      Stubbing time is risky, better an approximate compare.
      Merge pull request #532 from kbarber/ticket/2.7.x/8312-zypper_latest
      Merge pull request #547 from pcarlisle/ticket/master/12126-fix-ruby1.8.5-acceptance
      Merge pull request #542 from jeffmccune/ticket/2.7rc/12881_fix_cron_missing_provider_error_message
      Merge pull request #551 from cprice-puppet/bug/2.7.x/12844-agent-enable-doesnt-remove-old-lockfile
      Merge pull request #556 from joshcooper/ticket/2.7.x/12914-poll-child
      Merge pull request #561 from pcarlisle/ticket/2.7.x/10722-error-on-bad-http-response
      Merge pull request #536 from pcarlisle/ticket/2.7.x/9491-filesetting-munging
      Merge pull request #544 from pcarlisle/ticket/master/12763-reloadable-plugins
      Merge pull request #560 from stschulte/ticket/2.7.x/7986
      Fix hash comparison under RSpec with 1.8.5
      Merge pull request #567 from Erkan-Yilmaz/master
      Merge pull request #562 from stschulte/ticket/2.7.x/12960
      Merge pull request #522 from domcleal/tickets/master/8011c
      Merge pull request #545 from pcarlisle/ticket/master/12891-reload-features
      Merge pull request #565 from lotheac/fix_subcommand_exit_status
      Document the problem with the `apply_to_device` and related methods.
      Clean up "foo" name in global resource state.
      Clean up the "foo" name in create_resources_spec.
      Finally, stop using the `foo` name in the type_spec test.
      Merge remote-tracking branch 'origin/2.6.x' into 2.7.x
      Merge remote-tracking branch 'origin/2.7rc' into 2.7.x
      Merge remote-tracking branch 'origin/2.7.x'
      Merge pull request #569 from pcarlisle/ticket/master/3910-server-authoritative
      Merge pull request #577 from joshcooper/maint/2.7.x/fix-etc-hosts-test
      Merge pull request #483 from daniel-pittman/maint/master/facter-1.5.7-compatibility-in-test
      Merge pull request #581 from joshcooper/maint/2.7.x/fix-fqdn-rendezvous
      Merge pull request #580 from pcarlisle/ticket/2.7.x/13117-semodule-broken
      Merge pull request #571 from puppetlabs/integration/master/7749-bootstrapping-puppet
      Merge pull request #590 from cprice-puppet/cleanup/master/trollop_pull_request
      Merge pull request #595 from jeffweiss/ticket/2.7.x/13380_cron_acceptance_tests_break_when_no_cron
      Merge pull request #470 from daniel-pittman/bug/2.7.x/12479-bad-undef-vs-regex-match-behaviour
      Merge pull request #597 from stschulte/ticket/2.7.x/8193
      Add a feature to detect RDoc 1.0.1 being present on the system.
      Fix 4-space indentation in puppet/util/rdoc.rb
      Document and cleanly fail when unsupported RDoc is used.
      Ruby 1.9.3 is strict about block argument counts.
      Ruby 1.9.3 has a different error when `require` fails.
      Simplify a YAML report test to work with Ruby 1.9
      Don't cache check for `cdrom` source in the apt provider.
      Avoid class level variables, as they are not helpful.
      Revert "Disable replace_file on Windows"
      Replace Puppet::Util::FileLocking with atomic `replace_file`
      Fix terminus testing for Ruby 1.9
      Handle YAML load errors from the new Psych YAML parser.
      Action definition requires at least one argument.
      Hash references on string now raise errors, not return nil.
      Eliminate dead home-made assertion-at-dev-time-only code.
      `instance_variables` changes return type between 1.8 and 1.9
      Syck specific YAML parser tests can only run with the old engine.
      Calling map on string now fails, rather than yielding the string.
      `String#to_a` doesn't work in Ruby 1.9
      Regular expression matching on symbols changed in Ruby 1.9
      Whitespace and formatting cleanup on shellquote spec.
      Fix the shellquote parser function on Ruby 1.9
      Protect all existing methods when monkey-patching.
      Handle the real semantics of `String#lines`...
      The return type of `methods` changed in 1.9
      A correct implementation of IO#binwrite for Ruby 1.8
      Fix Cisco device canonicalization regular expression on 1.9
      Partially fix UTF-8 and PSON encoding tests for Ruby 1.9
      Implement YAML 1.1 binary data encoding in ZAML
      When shutting down Mongrel, wait synchronously for stop.
      Use PID-based ports to test web server listening.
      Remove the "fails_on_ruby_1.9.2" tag from tests...
      Trivial spelling fix.
      Whitespace cleanup in old-style aptrpm package test.
      Port old `test/language` tests into rspec...
      Port `test/provider` to RSpec
      Port Puppet[:path] test from Test::Unit to RSpec
      Port Puppet[:libdir] and LOAD_PATH test from Test::Unit
      Port tests of the defaults system from Test::Unit.
      Port some type class tests over to RSpec.
      Port over `ral/manager` tests to RSpec.
      Port some exec tests from Test::Unit to RSpec
      Port the useful cron Test::Unit test to an acceptance test.
      Port the mailalias test directly to RSpec.
      Port the crontab Test::Unit tests to RSpec.
      Port the aptrpm and aptitude tests from Test::Unit.
      Port the provider tests from Test::Unit.
      Port the base service provider tests from Test::Unit.
      Port the large fixture for the sshkey test from Test::Unit.
      Remove useless or redundant Test::Unit tests.
      Use RbConfig rather than Config
      Fix signal handling test vs Ruby 1.9 async signals.
      Fix nameservice provider auto-generated IDs that may overlap.
      Define Symbol#intern if missing.
      Modernize selector_spec, add Ruby 1.9.2 support, with bonus bugfix.
      Merge pull request #575 from daniel-pittman/maint/master/ruby-1.9.3-support
      Ruby 1.9.3-p0 support in spec tests.
      Merge pull request #615 from daniel-pittman/maint/master/ruby-1.9.3-support
      Merge pull request #613 from puppetlabs/geordi
      Merge pull request #621 from puppetlabs/integration/master/13588-log-dir-perms
      Merge pull request #620 from kelseyhightower/kelseyhightower/ticket/2.7.x/3581_fork_that
      Merge pull request #627 from kelseyhightower/ticket/2.7.x/13642_move_search_notice
      Merge pull request #629 from kelseyhightower/ticket/2.7.x/13643_make_rm_rf_secure
      Merge pull request #625 from kelseyhightower/ticket/2.7.x/13638_add_pre_funciton
      Merge pull request #630 from kelseyhightower/ticket/2.7.x/13649_restrict_module_matching
      Merge pull request #611 from pcarlisle/ticket/2.7.x/12101-reapply-autoload
      Merge pull request #649 from jeffmccune/maint/2.7.x/puppet_module_build_help
      Merge pull request #612 from zaphod42/refactor/remove-unused-fileserver
      Merge pull request #639 from pcarlisle/ticket/2.7.x/13659-postgres-integer-facts
      Merge pull request #614 from cprice-puppet/bug/2.7.x/13397-ensure-latest-multiple-gems
      Bring Nagios module back into the core.
      Merge pull request #658 from pcarlisle/ticket/2.7.x/13640-daemon-infinite-loop
      Use Win32 API atomic replace in `replace_file`
      Make `binwrite` emulation work on Windows.
      Fix Rails schema setup on Windows.
      Forcibly remove temporary files in tests.
      Recover better when `maxgroups` is not implemented.
      Store Rails logs on physical disk when testing.
      Make a path absolute on Windows as well as Unix.
      Accept paths with `~` for `generate` on Windows.
      Make the base service provider spec work on Windows.
      Use platform path separator in tests.
      Use a platform temporary file instead of a Unix one.
      Manually load Win32{API,OLE} for Ruby 1.9.
      Use conditional pending to block out "fails_on_windows" tests.
      Merge pull request #616 from jeffweiss/ticket/master/13435_csrs_signed_with_sha1
      (#13284) Fix missing env vars during provider command execution
      Merge pull request #679 from jeffweiss/ticket/master/13898_fail_face_on_option_clash
      Merge pull request #681 from jeffweiss/ticket/2.7.x/14036_handle_upstart_better
      Implement Array#drop for Ruby 1.8.5
      Merge pull request #696 from zaphod42/feature/2.7rc/14101-improved-dynamic-scope-warning-message
      Modernize the style of the shell exec provider tests.
      (#14123) Puppet shouldn't explode if PATH contains ~nonexistent_user
      (#14060) Fix quoting of commands to interpolate inside the shell.
      Modernize the style of the shell exec provider tests.
      (#14060) Fix quoting of commands to interpolate inside the shell.
      (#14127) ssh_authorized_keys grammer fails on blank lines.
      Merge 2.6.x into 2.7.x
      Merge 2.7.x into master.
      Merge pull request #687 from jeffweiss/maint/master/add_provider_confine_exists_nil_spec
      Merge pull request #634 from stschulte/ticket/2.7.x/13645
      Merge branch 'pcarlisle-ticket/master/3910-updates'
      Fix over-stubbing in tests revealed by agent changes.
      Merge 2.7.x into master.
      Merge pull request #695 from jeffweiss/ticket/master/13966_remove_name_option
      Fix some additional test problems in skipping pluginsync.
      Merge 'pluginsync-error' from pcarlisle
      (#14173) Enforce that filebucket paths must be absolute
      Merge 'puppet-feature/master/3757-agent-lockfiles' from cprice
      Just change Puppet settings in tests, rather than stubbing.
      Merge pull request #714 from daniel-pittman/maint/2.7.x/fix-busted-colour-tests
      Merge pull request #709 from cprice-puppet/feature/master/log_spec_order
      Merge pull request #703 from cprice-puppet/feature/master/filter_resource_type_by_type
      Merge pull request #690 from jeffweiss/ticket/master/14072_allow_faces_to_inline_setting_docs
      Merge pull request #702 from jeffweiss/ticket/master/13948_libdir_not_in_load_path
      Merge branch 'puppet-cleanup/master/bad-settings-specs' from cprice
      Merge branch 'feature/13970/remove-dynamic-scoping' from zaphod42
      Save face loader state in a different, more robust way.
      Merge branch 'bug/master/face-loading-order-dependent-failure'
      Merge branch 'ticket/master/13349_incorrect_scope_behavior' from jeffweiss
      Merge pull request #710 from cprice-puppet/bug/master/13429-faces-as-libraries
      Merge branch 'cprice-puppet-bug/master/14200-help-face-bad-docs'
      Merge pull request #631 from kbarber/ticket/2.7.x/13651-magenta_not_purple
      Merge 2.7.x into master.
      Merge pull request #659 from bodepd/bug/master/13888_systemd_self_instances_fix
      Merge pull request #719 from stschulte/feature/2.7.x/11004
      Merge 2.7.x into master.
      Revert "(#11004) Fix regex for pkg provider line matching"
      Merge branch '2.7.x'
      Merge pull request #729 from pcarlisle/baduser-windows
      Merge pull request #706 from pcarlisle/autoloader-windows
      Merge pull request #726 from pcarlisle/ticket/master/14229-path-setting
      Merge pull request #1 from stschulte/ticket/2.7.x/14127_2
      Merge pull request #728 from pcarlisle/maint/2.7.x/post-facts
      Merge pull request #715 from ccaum/static_compiler_fix
      Merge pull request #718 from kelseyhightower/ticket/master/8235_plugin_system_for_tools_like_hiera
      (#14288) gem provider should tolerate bad lines.
      Merge pull request #645 from zaphod42/refactor/master/stop-provider-from-using-deprecated-execution-methods
      Merge pull request #732 from kelseyhightower/maint/master/8235_improve_plugin_system_test_coverage
      Remove a bad test that can lead to random hangs...
      Merge branch '2.7.x'
      Merge pull request #743 from kelseyhightower/ticket/master/14348_hiera_should_be_the_default_data_binding_terminus
      Merge pull request #746 from pcarlisle/ticket/master/13858-types-in-environments
      Merge pull request #747 from cprice-puppet/cleanup/master/windows-tmpfile-acceptance-failures
      Merge pull request #752 from kelseyhightower/master
      maint: use relative paths to fixtures.
      (#10146) `-` is not legal in variable names.
      Whitespace and logic cleanups for command line tests.
      (#14322) Make `--version` or `-V` options work globally.
      Merge pull request #760 from pcarlisle/maint/master/remove-deprecated-standalone-commands
      Merge pull request #688 from ustuehler/master
      Merge pull request #738 from nanliu/ticket/2.7.x/14296
      Merge pull request #748 from pcarlisle/maint/master/rubygems-i-hate-you
      Merge pull request #750 from pcarlisle/maint/master/base-setting-refactor
      Merge pull request #753 from nicklewis/type-loader-performance
      Merge pull request #754 from cprice-puppet/bug/master/14200-face-class-names
      Fix acceptance test assumption about exec logging.
      (#13559) Promote new console output prototype to official.
      Merge pull request #762 from zaphod42/bug/master/14387-user-agent-for-module-tool
      Merge pull request #761 from cprice-puppet/bug/master/13559-two-console-output-styles-enter-one-style-leaves
      Merge pull request #765 from nfagerlund/maint/2.7.x/no-private-forges
      Rewrite `have_printed` matcher to be more robust.
      Merge branch 'maint/master/fix-printing-version' by pcarlisle
      Merge pull request #756 from kelseyhightower/ticket/2.7.x/14424_expand_path_of_target_directory
      Merge pull request #778 from kelseyhightower/master
      (#3669) Disable SRV record use by default.
      Merge pull request #775 from pcarlisle/maint/master/network-device-node_terminus
      Bump Puppet version to 3.0.0 for the Telly release.
      Merge pull request #795 from zaphod42/bug/2.7.x/8174-incorrect-warning-about-deprecated-scoping
      Merge remote-tracking branch 'origin/2.7rc' into 2.7.x

Dean Wilson (2):
      Display the correct option when rasing the error - issue #7476
      (#10950) Make config print default to printing all options

Deepak Giridharagopal (10):
      Merge pull request #291 from jhelwig/fix-instrumentation-file-case
      Merge pull request #383 from daniel-pittman/bug/2.7.x/6710-fixed-1.9.2-test-failures
      Merge pull request #382 from masterzen/tickets/master/11044
      Merge pull request #425 from daniel-pittman/bug/2.7.x/12269-multiple-cycles-in-graph-fail-on-sort
      (#12452) Make Puppet::Util::SELinux#read_mounts work on Ruby 1.9
      Merge pull request #458 from daniel-pittman/bug/2.7.x/12405-remove-old-storeconfig-cleaner
      Disable specs that use replace_file on Windows
      Merge pull request #546 from nicklewis/ticket/2.7.x/11988
      Merge pull request #552 from nicklewis/ticket/2.7.x/11988
      Merge pull request #698 from daniel-pittman/bug/2.7.x/14060-incorrect-quoting-in-shell-exec-provider

Dieter De Meyer (1):
      (#3324) yumrepo doesn't support ssl options

Dominic  Maraglia (1):
      Merge pull request #359 from djm68/pending_test_ticket_11727

Dominic Cleal (19):
      (#8011) Support temp repo URLs in pkgutil provider
      (#8808) Fail Augeas resource when unable to save changes
      (#8808) Fail Augeas resource when unable to save changes
      (#5606) Print Augeas' /augeas//error info to debug on save failure
      (#9039) Update Augeas commands documentation
      (#10807) Use SMF's svcadm -s option to wait for errors
      (#7285) Add spec for Augeas initialisation and file loading
      (#7285) Use Augeas NO_LOAD/incl to optimise loading based on context
      (#7592) Replace all Augeas resource stubs with real resources
      (#11414) Save/execute changes on versions of Augeas < 0.3.6
      (#11414) Test Augeas versions correctly with versioncmp
      (#12051) Send exec onlyif/unless command output to debug log
      (#11961) Apply and catch a timeout when contacting PyPI over XMLRPC
      (#11826) Fix error when no certs were printed to console from ca face
      (#8011) Support temp repo URLs in pkgutil provider
      (#11988) Work around Augeas reload bug when changing save modes
      (#11988) Work around Augeas reload bug when changing save modes
      (#13204) Workaround duplicate Augeas save events
      (#13204) Don't ignore missing PATH.augnew files

Dominic Maraglia (12):
      Merge branch 'ticket/2.6.x/6418'
      Merge branch 'master' of github.com:puppetlabs/puppet
      (9547) Minor mods to acceptance tests
      (maint) Remove ssl dir before starting a master with DNS alt names
      (maint) Remove ssl dir before starting a master with DNS alt names
      (#10032) Update test to run on solaris
      (#11764) Fix cron jobs for passing block to method
      (#11764) Fix failing cron test
      (#11727) Fix support stdin test
      (#11727) Another fix to 11727
      (maint) Fix test 3360 to use per host cfg data
      (#11727)  Move test for 11727 to pending

Eli Klein (1):
      Added missing RequestHeader entries to ext/rack/files/apache2.conf

Eric Shamow (1):
      (#7801) Modify include function to accept arrays

Eric Sorenson (3):
      Merged updates to regexp_nodes from our production fork
      Adds support for setting environment via regexp files
      Mised a Fixme: Add link to redmine ticket describing ENC/env interaction

Erkan Yilmaz (1):
      missing: )

François Beausoleil (1):
      Documenting missing --noop option for puppet apply

Franz Pletz (2):
      (#9443) Allow digits in face names
      (#9160) Change logging facility to debug for not supported provider features

Gary Larizza (35):
      Add has_macosx_plist_overrides? method
      Add comment explaining helper method
      Bring up to date with topic branch
      Whitespace and Alignment Commit
      Implement Caching
      First attempt at launchd spec
      Rearrange launchd provider
      Revert launchd_spec
      Change method used to get Fact Value
      Whitespace Commit
      Documentation Commit
      Optimize @product_version variable
      Stub call to Facter
      Test prefetching
      Deprecation Warning if using Facter <= 1.5.5
      Refactor status method
      Refactor launchd provider spec tests
      Use instance variable for job_list
      Use memoization instead of 'unless'
      Remove use of defined?()
      Reset the @job_list variable between tests
      Reset the @macosx_version_major variable
      Remove test dependencies on QUANTITY of calls
      Include necessary Facter stubs
      Stub File.open to not touch the disk
      Build a Rake task for building Apple Packages
      Access user password hash in OS X 10.7
      (#11293) Add password get/set behavior for 10.7
      Clean up launchd spec tests
      (#2773) Use launchctl load -w in launchd provider
      Build a Rake task for building Apple Packages
      (#4855) Fix group resource in OS X
      (#3419) Fix OS X Ruby supplementary group handling
      (#5445) Create /var/lib/puppet in OS X Package
      [#13686] Fix directoryservices ShadowHashData code

Greg Sutcliffe (2):
      Add support for Yaourt (AUR helper) to Pacman provider
      Correctly check that Yaourt is present

Hunter Haugen (6):
      Tests for deprecation warnings for dynamic scoping
      Implement newlookupvar() to replace dynamic scope
      Remove dynamic option for lookupvar
      Add tests for mixed inheritence/inclusion
      Make new scoping look through inherited scopes
      Use more descriptive terms for the differing scopes

Ilya Sher (1):
      (#11333) Make Puppet::Type.ensurable? false when exists? is undefined

Jacob Helwig (116):
      (#7581) Provide more detailed error message when missing gems on Windows
      Merge branch 'ticket/master/7581-windows-feature-detection-error-message'
      Disable the master on Windows instead of blowing up with failed resources
      Merge branch 'disable-master-on-windows'
      (#8356) Specify setting type for color
      Merge branch 'ticket/master/8356-color-setting-on-windows'
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      (#8392) Disable master related tests on Windows
      Merge branch 'ticket/master/8392-disable-master-tests-on-windows'
      Disable symlink related file tests on Windows
      Clarify logic and error messages when initializing Puppet::FileBucket::File
      Consolidate test logic determining if a registered file is in the temp directory
      Treat Windows absolute paths as absolute paths
      Always put a slash between the checksum and path in filebucket URLs
      Disable file bucket diffing tests on Windows
      Remove :fails_on_windows from file type tests that no longer fail on Windows
      Check for the appropriate permissions in File type tests on Windows
      Merge branch 'file-test-on-windows'
      Add document outlining preferred contribution methods
      Add document outlining preferred contribution methods
      Merge remote-tracking branch 'nicklewis/ticket/2.6.x/8770' into 2.6.x
      Merge remote-tracking branch 'nicklewis/ticket/2.6.x/8770' into 2.6.x
      Do not leak indirector state from apply tests
      Reset indirector state after configurer tests.
      Merge branch '2.6.x' into 2.7.x
      (#7581) Provide more detailed error message when missing gems on Windows
      Disable the master on Windows instead of blowing up with failed resources
      (#8356) Specify setting type for color
      (#8392) Disable master related tests on Windows
      Disable symlink related file tests on Windows
      Clarify logic and error messages when initializing Puppet::FileBucket::File
      Consolidate test logic determining if a registered file is in the temp directory
      Treat Windows absolute paths as absolute paths
      Always put a slash between the checksum and path in filebucket URLs
      Disable file bucket diffing tests on Windows
      Remove :fails_on_windows from file type tests that no longer fail on Windows
      Check for the appropriate permissions in File type tests on Windows
      Clean up formatting & whitespace in package type & providers
      Clean up formatting & whitespace in Puppet::Type
      Correct grammar in parameter comment
      (#8412) Add optional type-level validation of the source parameter
      (#8412) Add MSI package provider for use with Windows
      Merge remote-tracking branch 'josh/ticket/2.7.x/9186-win-2008-failures' into 2.7.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/9458-puppet-fails-when-no-subcommand' into 2.7.x
      Whitespace cleanup in Type::SshAuthorizedKey
      Wrap long lines in Type::Package
      Move parameter formatting rules into helper method
      Add support for displaying hashes to Puppet::Parameter.format_value_for_display
      Add ability to look up fully qualified local accounts using Puppet::Util::Adsi.sid_for_account
      (#8414) Require win32-taskscheduler gem on Windows
      (#8414) Create scheduled_task type for use with Windows scheduled tasks
      Merge remote-tracking branch 'josh/maint/2.7.x/reenable-fails-on-windows' into 2.7.x
      Merge remote-tracking branch 'josh/puppet-resource-package' into 2.7.x
      Merge remote-tracking branch 'josh/sticky-bit' into 2.7.x
      Merge remote-tracking branch 'stschulte/ticket/2.7.x/9796' into 2.7.x
      (#9831) Standardize Windows provider confining
      (#9996) Restore functionality for multi-line commands in exec resources
      Merge remote-tracking branch 'josh/ticket/2.7.x/9636-onlyif-unless-windows-exec' into 2.7.x
      (#9996) Restore functionality for multi-line commands in exec resources
      Merge branch 'tickets/master/8011' of git://github.com/domcleal/puppet
      Revert "Merge branch 'tickets/master/8011' of git://github.com/domcleal/puppet"
      Realign test/lib/puppettest.rb after the Great Indentation Change
      Reset saved indirection state to an empty hash instead of nil after restoring
      Merge remote-tracking branch 'upstream/2.6rc' into 2.6.x
      Merge branch '2.7rc' into 2.7.x
      (#9109) Retrieve request parameters from the request body for POSTs
      Merge remote-tracking branch 'nfagerlund/maint/2.7.x/type_reference_revisions' into 2.7.x
      Merge remote-tracking branch 'nfagerlund/ticket/2.7.x/7601-type_reference_definition_lists' into 2.7.x
      Merge remote-tracking branch 'nicklewis/fix-windows-ca-specs' into 2.7.x
      Merge remote-tracking branch 'nicklewis/ticket/2.6.x/10289' into 2.6.x
      Merge remote-tracking branch 'nicklewis/ticket/2.6.x/10289' into 2.6.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/10161-spurious-ruby-error' into 2.7.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/10269-search-traverse-bit-not-set' into 2.7.x
      Merge branch 'ticket/10081' of git://github.com/jgrocho/puppet
      Revert "Merge branch 'ticket/10081' of git://github.com/jgrocho/puppet"
      Merge remote-tracking branch 'josh/ticket/2.7.x/10269-build-break' into 2.7.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/9983-binary-mode-windows' into 2.7.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/9983-binary-mode-windows' into 2.7rc
      Merge remote-tracking branch 'josh/ticket/2.7.x/10614-handle-non-ntfs' into 2.7.x
      Merge branch 'ticket/2.7rc/10614-handle-non-ntfs' into 2.7rc
      Merge remote-tracking branch 'nicklewis/ticket/2.7rc/9671' into 2.7rc
      Merge remote-tracking branch 'nicklewis/ticket/2.7rc/9671' into 2.7.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/10727-undefined-method-pathname' into 2.7.x
      Merge remote-tracking branch 'josh/ticket/2.7.x/10727-undefined-method-pathname' into 2.7rc
      Merge remote-tracking branch 'josh/ticket/2.7.x/10799-malformed-puppet-bat' into 2.7.x
      (#7274) Output 4-digit file modes in File type
      (#8255) Always use string modes when creating resources from FileSetting settings
      (#3669) Find servers via DNS SRV records
      Merge branch 'tickets/2.7.x/6335-allow-trailing-comma-in-parameterized-classes' into 2.7.x
      Merge branch 'tickets/2.7.x/6697-default-service-provider-path-for-archlinux' into 2.7.x
      Merge remote-tracking branch 'nicklewis/ticket/2.7.x/2744' into 2.7.x
      Merge remote-tracking branch 'kelsey/ticket/master/11115_puppet_spec_test_do_not_run_under_rspec_2.7.x'
      Merge remote-tracking branch 'domcleal/tickets/master/7285c'
      Merge remote-tracking branch 'patrick/fix_autorequire_tests' into 2.7.x
      Merge remote-tracking branch 'patrick/fix_autorequire_tests' into 2.7.x
      Merge branch 'tickets/master/10032-fix-acceptance-path-issues-on-solaris'
      Merge remote-tracking branch 'nicklewis/fix-read_body-called-twice'
      Merge remote-tracking branch 'nfagerlund/ticket/2.7.x/11291_show_diffs_description' into 2.7.x
      Revert "Build a Rake task for building Apple Packages"
      Merge remote-tracking branch 'nicklewis/master'
      Merge remote-tracking branch 'stschulte/ticket/2.7.x/9544' into 2.7.x
      Merge branch 'tickets/2.7.x/6412' into 2.7.x
      Merge branch 'apache2-conf-fix' of git://github.com/eklein/puppet into 2.7.x
      Merge branch 'add-pkgin-provider'
      Merge branch 'tickets/2.7.x/10676' into 2.7.x
      Merge branch 'tickets/2.7.x/7106-last-run-summary-permissions' into 2.7.x
      Account for Windows file mode translation for lastrunfile
      Disable SRV lookups of hosts by default when testing
      Use a sequence instead of a state machine in testing packman provider
      Merge branch 'pacman-provider-updates'
      Merge remote-tracking branch 'masterzen/feature/instrumentation' into 2.7.x
      Use all lower-case file name for Puppet::Util::Instrumentation::Instrumentable
      Merge remote-tracking branch 'masterzen/wip/instrumentation-1.9.2-fixes' into 2.7.x
      Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x

James Turnbull (8):
      (#10064) Add the Puppet environment to reports
      Merge pull request #254 from kelseyhightower/ticket/2.7.x/11198_generated_module_templates_should_have_a_default_license
      Fixed #11844 - Typo in exec documentation
      (#11888) Switch up2date,systemd,redhat providers to osfamily fact
      Fixed #11888 - Changed providers to use osfamily fact.
      (#10064) Add the Puppet environment to reports
      Fixed #10219 - uninitialized class variable Schedule type
      (#3452) Autorequire user for cron

Jason A. Smith (1):
      (#7660) Add init script for puppet queue

Jeff Blaine (1):
      Removed spurious "exec" from a debug string

Jeff McCune (72):
      (#8032) Add containment to create_resources
      Merge pull request #15 from jeffmccune/ticket/master/8032_create_resources_containment
      Merge pull request #24 from nfagerlund/maint/2.7.x/misc_doc_fixes
      Merge branch 'feature/2.7.x/9051-storeconfig-backend-should-be-configurable' into 2.7.x
      Merge branch 'tickets/2.7.x/7982' into 2.7.x
      Improve the error message when a CSR is rejected
      Improve the error message when a CSR is rejected
      (#11246) Add UTF-8 String#to_yaml spec tests
      (#11246) Fix UTF-8 String#to_yaml exception
      Merge pull request #249 from lifton/master
      Merge pull request #258 from lifton/ticket/2.7.x/7110_better_ssl_error
      (#11246) Add README_DEVELOPER describing UTF-8 in Puppet
      (maint) Fix grammar mistakes in README_DEVELOPER
      Merge pull request #261 from jeffmccune/minor/2.7.x/11246_fix_grammar_feedback_from_brice
      Merge pull request #281 from joshcooper/ticket/2.7.x/11408-fact-plugin-sync
      Merge pull request #280 from joshcooper/ticket/2.7.x/10586-file-sourcing-from-master
      Merge pull request #282 from jhelwig/last-run-summary-permissions-on-windows
      Merge pull request #289 from nfagerlund/maint/2.7.x/typo_in_create_resources
      Merge pull request #306 from glarizza/bug/2.7.x/11293_users_osx
      Revert "Access user password hash in OS X 10.7"
      Merge branch 'bug/2.7.x/11293' into 2.7.x
      Merge branch 'bug/master/10837_retry_inventory_save_on_failure'
      Merge branch 'bug/2.7.x/10837_retry_inventory_save_on_failure' into 2.7.x
      Fixup two space merge conflict from 2.7.x => master
      (#11714) Add envpuppet batch file to run Puppet from source on Windows
      Merge pull request #323 from glarizza/bug/2.7.x/fix_launchd_spec
      Merge branch 'tickets/2.7.x/11888' into 2.7.x
      Merge pull request #325 from glarizza/bug/2.7.x/4855_osx_group_failure
      Merge pull request #230 from daniel-pittman/feature/2.7.x/symbolic-modes-for-the-file-type
      Merge pull request #334 from daniel-pittman/feature/2.7.x/merge-2.6.x-branch
      Merge branch 'feature/master/merge-2.7.x-branch'
      (#11888) Revert 483a1d9 for 2.7.x only
      Merge branch 'bug/2.7.x/11499-better-ip-address-validation-for-host-type' into 2.7.x
      (#11057) Add spec, should notify why a run is skipped
      Merge branch 'bug/2.7.x/11057-debug-output-enhancement' into 2.7.x
      Merge pull request #353 from daniel-pittman/bug/master/11727-allocate-pty-in-the-acceptance-test
      (#12088) Add rake download and unpack handlers
      (#12088) Add windows:build task to build MSI package
      Merge branch 'ticket/2.7.x/11955-binread' into 2.7.x
      Merge remote-tracking branch 'joshcooper/ticket/2.7.x/10417-no-diff-on-windows' into 2.7.x
      (#6771) Check for ActiveRecord::Base instead of Puppet.features.rails?
      Merge branch 'bug/2.7.x/6771-always-close-activerecord-connections-in-tests' into 2.7.x
      Merge branch 'ticket/2.7.x/12114-file-face-help' into 2.7.x
      Merge branch 'bug/2.7.x/12188-pid-handling-warning-cleanup' into 2.7.x
      Merge pull request #421 from daniel-pittman/bug/2.7.x/12188-pid-handling-warning-cleanup
      Revert "Merge pull request #396 from jeffmccune/feature/2.7.x/12088_windows_build_tasks"
      Merge remote-tracking branch 'joshcooper/ticket/2.7.x/12412-windows-acceptance-tests' into 2.7.x
      Merge branch 'joshcooper-ticket/2.7.x/10299-LocalSystem-not-root' into 2.7.x
      Merge branch 'ticket/2.7.x/11408-remote-recursion' into 2.7.x
      Merge pull request #519 from daniel-pittman/bug/2.7.x/12564-insufficient-stubbing-of-childstatus
      Merge pull request #520 from joshcooper/ticket/2.7.x/11740-handle-is-invalid
      Merge branch 'ticket/2.7.x/12725-puppet-kick-windows' into 2.7.x
      (#12881) Fix cron type default name error on windows
      Merge pull request #570 from francois/master
      Merge branch 'bug/2.7.x/13686_DS_Fix' into 2.7.x
      (maint) Remove unnecessary step from puppet module build help
      Merge branch 'ticket/2.7.x/12392-eventlog' into 2.7.x
      Merge pull request #650 from joshcooper/maint/2.7.x/eventlog
      Merge pull request #666 from joshcooper/win-service-eventlog
      (maint) Ensure every file has a trailing newlines
      (#13682) Rename Puppet::Module::Tool to Puppet::ModuleTool
      (#13682) Fix acceptance test failures
      Merge branch 'ticket/2.7.x/13682_puppet_should_not_conflict_with_released_puppet-module_gem' into 2.7.x
      Merge remote-tracking branch 'joshcooper/ticket/2.7.x/13956-colorize-windows' into 2.7.x
      (maint) Fix destinations_spec failure on windows
      Just change Puppet settings in tests, rather than stubbing.
      Merge remote-tracking branch 'jeffmccune/fix/2.7.x/specs_fail_without_win32console_gem' into 2.7.x
      (#13956) Fix failing spec tests
      Merge branch 'fix/2.7.x/13956_fix_spec_tests_when_win32console_is_missing' into 2.7.x
      (#8778) Make '' == undef commutative in the DSL
      Merge branch 'ticket/2.7.x/8778_equality_in_puppet_is_not_commutative' into 2.7.x
      Merge pull request #744 from pcarlisle/maint/2.7.x/ansicolor-recursion

Jeff Weiss (48):
      (#7762) In DSL allow UNLESS as replacement for IF NOT
      (#11593) Remove support for OS X 10.4 and earlier
      (#11593) Remove support for OS X 10.4 and earlier
      (#11593) Remove support for OS X 10.4 and earlier
      (#11593) Remove support for OS X 10.4 and earlier
      (#12372) Remove duplicate methods from certificate_request
      (#12401) Remove files that should have been removed earlier
      (#12399) DRY up rest.rb
      (#13296) 'unless' as a parameter inside a resource causes syntax error
      (#4146) Refactor Nagios to module
      (#13380) Cron acceptance tests don't ensure cron actually installed
      (#13296) allow any keyword as resource param name
      (#13435) Change default signing digest algorithm
      (#12396) DRY up self.timeout
      Merge remote-tracking branch 'kelseyhightower/kelseyhightower/ticket/2.7.x/9167_tagmail_report_sends_email_when_nothing_happens' into 2.7.x
      Merge remote-tracking branch 'kelseyhightower/ticket/2.7.x/13637_rename_build_tree_to_format_tree' into 2.7.x
      Merge remote-tracking branch 'kelseyhightower/ticket/2.7.x/13639_use_puppet_logging_not_stderr' into 2.7.x
      Merge remote-tracking branch 'seanmil/schedule/feature/13054_rangespan-rebase'
      (documentation) Change README.md to use backtick
      Merge remote-tracking branch 'domcleal/tickets/2.7.x/13204-aug-boot-enoent' into 2.7.x
      Merge remote-tracking branch 'MosesMendoza/ticket/2.7.x/12466_unset_X-Forwarded-For_headers_in_supplied_config' into 2.7.x
      Merge remote-tracking branch 'nicklewis/zaml-strings-containing-hex-numbers' into 2.7.x
      Merge remote-tracking branch 'cprice-puppet/bug/master/fix-console-logging-for-no-daemonize'
      Merge remote-tracking branch 'domcleal/tickets/2.7.x/13204-aug-boot-enoent-uniq' into 2.7.x
      Merge remote-tracking branch 'seanmil/schedule/bug/7639-abbreviated_ranges'
      Merge remote-tracking branch 'joshcooper/maint/2.7.x/eventlog-order-dependent-test' into 2.7.x
      Merge remote-tracking branch 'zaphod42/bug/2.7.x/8174-incorrect-warning-about-deprecated-scoping' into 2.7.x
      Merge remote-tracking branch 'cprice-puppet/bug/master/13929-exit-on-fail-logging'
      Merge remote-tracking branch 'pcarlisle/maint/2.7.x/util_require_puppet' into 2.7.x
      Merge remote-tracking branch 'haus/update_puppet_spec_for_rpm_2.7.x' into 2.7.x
      Merge remote-tracking branch 'zaphod42/bug/2.7.x/8174-incorrect-warning-about-deprecated-scoping' into 2.7.x
      (#13898) Fail Face when option collides w/ setting
      (#14036) Handle upstart better
      (#13898) Fail Face when option collides w/ setting
      (#14036) Add upstart tests
      Merge remote-tracking branch 'joshcooper/maint/master/regexp-escape-command'
      Merge remote-tracking branch 'daniel-pittman/maint/master/add-array-drop-to-1.8.5'
      (maint) Add provider confine :exists => nil spec
      (maint) Get provider specs working on windows
      (#13966) Remove Puppet[:name] option
      (#14072) Allow faces to inline global setting docs
      (#13948) $libdir not in $LOAD_PATH
      (#13966) Fix default pidfile race condition
      (maint) Fix acceptance test for Windows
      (#13349) Fix incorrect scope behavior
      (#13349) Add integration test for incorrect scope
      Merge remote-tracking branch 'pcarlisle/repase_config_fix'
      Merge remote-tracking branch 'cprice-puppet/bug/master/14440-rake-manpages'

Jeffrey C. Ollie (2):
      (#7999) Add a service provider that manages systemd services natively
      (#7999) Add some basic tests of the systemd provider

Joe Hillenbrand (1):
      Show the process line matched for services in debug.

Jonathan Grochowski (1):
      (#10081) Creating RC tarballs should be handled by rake.

Josh Cooper (243):
      (#8356) Color defaults to false on Windows
      Merge branch 'ticket/master/8356-default-color-should-be-false-on-windows'
      (#8268) Fix resource harness spec tests
      Merge branch 'feature/master/8268-puppet-agent-windows'
      (#8489) Consistently use File::PATH_SEPARATOR
      (#8268) Require windows drive letters in absolute file paths
      Fix tests with "relative" paths on Windows
      Maint: Tagged spec tests that are known to fail on Windows
      Maint: Don't test for extended signals on Windows
      Maint: Fix miscellaneous tests
      Merge branch 'feature/master/8268-puppet-agent-windows'
      Fix spec test failure on 1.9.2
      Merge branch 'feature/master/8268-puppet-agent-windows'
      Update certificate spec tests for Windows
      Disable spec tests for unsupported functionality on Windows
      Fix issue with forward and backslashes in Windows paths
      Merge branch 'feature/master/8268-puppet-agent-windows'
      Merge branch 'master' of github.com:puppetlabs/puppet
      (#8663) Reenable spec tests on Windows that now pass
      (#8663) The ssh_authorized_key type is not supported on Windows
      (#8663) Update the run_mode spec test on Windows to match the code
      (#8663) Drive letters are not valid absolute paths on Windows
      Merge branch 'ticket/master/8663-windows-spec-tests'
      (#8663) Disable spec tests for unsupported functionality on Windows
      Merge branch 'ticket/master/8663-windows-spec-tests'
      (#8660) Default config dir to %PROGRAMDATA% on Windows
      (#8660) Fix destdir option on Windows
      Merge branch 'ticket/master/8660-default-windows-install-paths'
      (#8644) Host provider on Windows
      Merge branch 'ticket/master/8644-host-provider'
      (#8663) Exclude git rev-parse HEAD spec test on Windows
      Merge branch 'ticket/master/8663-windows-spec-tests'
      (#8663) Exclude exec timeout test on Windows
      Merge branch 'ticket/master/8663-windows-spec-tests'
      (#8740) Do not enumerate files in the root directory.
      maint: Fix order dependent test failure
      maint: Fix build break due to recent merge from 2.7.x to master
      (#8356) Color defaults to false on Windows
      (#8268) Fix resource harness spec tests
      (#8489) Consistently use File::PATH_SEPARATOR
      (#8268) Require windows drive letters in absolute file paths
      Fix tests with "relative" paths on Windows
      Maint: Tagged spec tests that are known to fail on Windows
      Maint: Don't test for extended signals on Windows
      Maint: Fix miscellaneous tests
      Fix spec test failure on 1.9.2
      Update certificate spec tests for Windows
      Disable spec tests for unsupported functionality on Windows
      Fix issue with forward and backslashes in Windows paths
      (#8663) Reenable spec tests on Windows that now pass
      (#8663) The ssh_authorized_key type is not supported on Windows
      (#8663) Update the run_mode spec test on Windows to match the code
      (#8663) Drive letters are not valid absolute paths on Windows
      (#8663) Disable spec tests for unsupported functionality on Windows
      (#8660) Default config dir to %PROGRAMDATA% on Windows
      (#8660) Fix destdir option on Windows
      (#8644) Host provider on Windows
      (#8663) Exclude git rev-parse HEAD spec test on Windows
      (#8663) Exclude exec timeout test on Windows
      maint: Fix build break due to recent merge from 2.7.x to master
      Merge branch 'backport-windows-work-to-2.7' into 2.7.x
      Merge remote-tracking branch 'jhelwig/add-missing-commit-for-ruby-1.8.5-compatibility-to-2.7.x' into 2.7.x
      maint: Stub spec test so directory is not created unnecessarily
      (#8662) Break circular feature dependency
      (#8662) Fix Puppet.features.root? on Windows
      (#8662) Skip user and group resources when applying settings on Windows
      (#8662) Don't manage internal file permissions on Windows
      (#8662) Don't rely on error message to detect UAC capable platform
      (#9329) Disable agent daemonizing on Windows
      (#9435) Fix absolute path matching for file log destinations
      (#9435) Gracefully handle when syslog feature is unavailable
      (#9186) Add the ability to get/set windows permissions
      (#8410) Fix child exit status on Windows
      (#9186) Change to shared_examples_for
      (#9186) Handle when running under non 'user' contexts
      (#9186) Fix tests that fail on 2008 when running as SYSTEM
      Fix order dependent test failures relating to ADSI
      Fix typo bug that prevented FILE_DELETE_CHILD from being set
      Add platform-specific metadata collectors
      Restrict the absolute path regex to the start of the string
      Added methods for manipulating URI and file paths
      Eliminate duplicate absolute path detection
      Simplify absolute path detection
      Fix issues with Windows based file URIs
      Merge pull request #120 from ChaseMotorman/ticket/2.7.x/9326-windows-cleartext-passwords
      Merge branch 'ticket/2.7.x/9328-user-group-sids' into 2.7.x
      (#9458) Require main puppet module
      Undo change to failing test on 1.8.5
      Merge branch 'maint/2.7.x/file-provider-build-break' into 2.7.x
      (#8411) Fix change group for POSIX file provider
      (#9027) Get rid of spurious info messages in groupadd
      Remove 'fails_on_windows' tag for passing tests
      Merge branch 'ticket/2.7.x/9459-user-group-failures' into 2.7.x
      Change test to not call 'rm -rf'
      Added 'touch' method enabling tests to run on Windows
      Change tests to not use 'mount' provider
      Update test due to lack of 'true' on Windows
      Disable mount provider tests on Windows
      Add Windows-specific tests when user parameter specified in exec
      Set vardir so that msi package provider runs on Windows
      Stub method for getting roles from the user provider
      (#9938) Allow directory sticky-ness to be set
      (#9461) Resolve executables using PATHEXT on Windows
      (#9607) Only validate package source when it is set or needed
      Merge remote-tracking branch 'jhelwig/tickets/2.7.x/8414-windows-task-scheduler-type' into 2.7.x
      (#9636) Fix PATHEXT resolution for paths other than system32
      (#9636) Always set $CHILD_STATUS when executing on Windows
      Maint: Remove duplicate path extension code
      Merge pull request #167 from jhelwig/tickets/2.7.x/9996-exec-resources-with-multiline-commands
      Merge pull request #164 from jhelwig/tickets/2.7.x/9831-standardize-windows-provider-confines
      (#10161) Parenthesize method arguments
      Merge pull request #182 from jhelwig/tickets/2.7.x/9109-retrieve-facts-from-post-in-mongrel
      (#10269) Search bit not set on newly created directories
      Maint: Fix test breakage
      (#10315) Add pending tests when following symlinks
      (#10365) Add pending test when file overwrites an executable directory
      (#10269) Make directories executable so they can be cleaned up
      (#9983) Add method for reading binary files
      (#9983) Checksum files in binary mode
      (#9983) Restore files in binary mode
      (#9983) Read file content in binary mode when backing up
      (#9983) Use binary mode when reading and writing FileBucketFiles
      (#9983) Read file content from disk using binary mode
      (#9983) Serve file content in binary mode
      (#9983) Checksum file in binary mode when storing to filebucket
      (#10614) Fix error checking for Windows BOOL return values
      (#10614) Fix setting and clearing read-only attribute on Windows
      (#10614) Add method for detecting Windows volumes that support ACLs
      (#10614) Provide default metadata values for Windows ACLs
      (#10614) Detect when trying to managing ACLs on a non-ACL volume
      (#10727) Don't rely on Kernel#Pathname
      (#10614) Fix error checking for Windows BOOL return values
      (#10614) Fix setting and clearing read-only attribute on Windows
      (#10614) Add method for detecting Windows volumes that support ACLs
      (#10614) Provide default metadata values for Windows ACLs
      (#10614) Detect when trying to managing ACLs on a non-ACL volume
      (#10799) Regexp escaping too much
      Merge branch 'ticket/master/3669-make-puppet-honor-DNS-SRV-records'
      Merge branch 'tickets/2.7.x/8255-use-string-mode-creating-file-setting-resources' of https://github.com/jhelwig/puppet into 2.7.x
      Merge branch 'tickets/2.7.x/7274-always-output-4-digit-modes' into 2.7.x
      (#10739) Provide default subjectAltNames while bootstrapping master
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      Merge remote-tracking branch 'domcleal/tickets/master/7592'
      (#7592) Remove redundant call to String#to_s
      Merge branch 'ticket/master/7592-augeas'
      Merge remote-tracking branch 'daniel-pittman/feature/master/9508-auth-any-rather-than-auth-no'
      Merge remote-tracking branch 'matt/ticket/2.7.x/11276_module_tool_tar_on_windows' into 2.7.x
      Merge remote-tracking branch 'masterzen/tickets/2.7.x/10066' into 2.7.x
      (#10586) Don't copy owner and group when sourcing files from master
      (#11408) Fix fact and plugin sync on Windows
      Merge remote-tracking branch 'pcarlisle/ticket/master/11552-remove-transobject-and-bucket'
      Merge remote-tracking branch 'matt/ticket/master/11595-delete_storeconfigs_activerecord_find'
      Merge branch 'tickets/2.7.x/11414' of https://github.com/domcleal/puppet into 2.7.x
      Merge remote-tracking branch 'pcarlisle/ticket/master/8296-xmlrpc_deletion'
      Merge branch 'ticket/master/11552-fix_puppetral_resource_parameters'
      (#11740) Disable failing test on Windows
      Merge branch 'ticket/2.7.x/11740-fails_on_windows_handle' into 2.7.x
      Merge branch 'ticket/2.7.x/11717-fix-adsi-user-create' into 2.7.x
      Merge branch '11764_fix_cron_tests_x2' of https://github.com/djm68/puppet into 2.6.x
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      Merge remote-tracking branch 'pcarlisle/hostname-not-match' into 2.7.x
      Merge branch '2.7.x'
      (#11847) Don't hard code ruby install paths in Windows batch files
      (#11714) Use `%~dp0` to resolve bat file's install directory
      Merge branch 'ticket/2.7.x/11714-envpuppet' into 2.7.x
      Maint: Don't use cached catalogs
      Maint: Actually test that a file can be sourced from remote master
      Merge branch 'ticket/master/acceptance-test-breakage'
      (#11929) Always serve files in binary mode
      (Maint) Fix time-dependent certificate factory test failures
      Merge branch 'bug/2.7.x/11803-broken-test-for-module-uninstall' into 2.7.x
      Merge branch 'ticket/2.7.x/11802-fix_path_separator_windows_test_failures' of https://github.com/mmrobins/puppet into 2.7.x
      Merge branch 'final_fix_11727_support_stdin_parsing_in_puppet_parser_validate'
      (#11767) No longer necessary to delete ssl directory in each test
      (Maint) Remove dead code
      (#11930) Use FileUtils.mkdir_p to recursively create directories
      (#11930) Use Puppet::Util.absolute_path? to validate paths
      (#11930) Add validation of Windows paths in the generate function
      (#11955) Monkey patch IO.binread and IO.binwrite
      (#11955) Refactor to use IO.binread
      (#6541) Use the same filebucket for backup and restore
      Merge branch '2.6.x' into 2.7.x
      (#10417) Disable `diff` on Windows by default
      (#6541) Use the same filebucket for backup and restore
      (#12114) Qualify usages of `::File` to avoid conflict with file face
      Merge branch 'bug/master/11860-LANG-environment-var'
      Merge branch 'bug/2.7.x/11423-better-collector-error-message' into 2.7.x
      (#12363) Use Tempfile to generate temp files
      (#12386) Disable puppet kick on windows
      Merge remote-tracking branch 'daniel-pittman/bug/2.7.x/symbolic-file-mode-acceptance-test-wtf' into 2.7.x
      Merge branch 'ticket/2.7.x/12349-order_module_list_stderr_output' of https://github.com/mmrobins/puppet into 2.7.x
      (#12412) Refactor puppet_resource('user') tests
      (#12412) Refactor puppet_resource('group') tests
      (#12412) Refactor puppet_resource('file')
      (#12412) Skip cron on Windows
      (#12412) Refactor puppet_resource('tidy')
      (#12412) Refactor puppet_resource('host')
      (#12412) Refactor puppet_resource('exec')
      (#12412) Skip symlink tests on Windows
      (#12412) Warn when running hostname -f on Windows agents
      (#12412) Use host-specific methods for generating tmp file/dir
      (#12412) Refactor execution of echo in acceptance tests
      (#12412) Skip ca acceptance test on Window agents
      (#12412) Mark symbolic file modes test as pending on Windows
      Maint: Fix parenthesize warning message
      Merge branch 'bug/master/12490-execution_spec-sets-ENV' of https://github.com/cprice-puppet/puppet
      (#12412) Don't assume the `root` user exists
      (#10299) Refactor Windows administrator detection
      (#10299) Use CheckTokenMembership to see if user has admin rights
      Merge pull request #489 from cprice-puppet/feature/2.7.x/5454-pluginsync-features-autosign
      (#12403) Refactor duplicate log setup
      Maint: Remove duplicate code from bad merge conflict
      (#12403) Always create a default log destination
      Merge pull request #507 from mmrobins/ticket/2.7.x/fix_module_spec_for_windows
      (#11408) Allow POSIX paths for files served to Windows agents
      (#11408) Skip default file permissions for sync'ed files on Windows
      (#11408): Don't add execute bit to newly created files on Windows
      (#12412) Mark symbolic file modes test as pending on Windows
      (#11740) Wait on the handle from the PROCESS_INFORMATION structure
      (#12725) Fix puppet agent --listen on Windows
      Maint: Fix bad copy and paste
      (#7592) Remove redundant call to String#to_s
      (#12914) Allow puppet to be interrupted while waiting for child
      (#7592) Remove redundant call to String#to_s
      (Maint) Don't change permissions on /etc/hosts
      (Maint) Consistently use the same agent fqdn
      (#12392) Created Windows eventlog message resource dll
      (#12392) Add eventlog destination and log to it by default on Windows
      (#12392) Don't require eventlog gem on non-Windows platforms
      (Maint) Tempfile paths on Mac contain '+' which must be escaped
      (Maint) Allow '+' to appear in generate function commands
      Merge branch 'maint/master/mac-tempfile-plus'
      (Maint) Don't assume eventlog gem is installed on Windows
      (Maint) Fix order-dependent test failure
      (#12392): Colorize console output on Windows
      Merge branch 'maint/master/ruby-1.9.3-support' of git://github.com/daniel-pittman/puppet
      (Maint) Mark failing tests as pending on Windows
      Merge branch 'maint/master/pending-windows'
      Maint: Escape command in regexp
      Merge branch 'maint/master/fix_provider_specs_for_windows'
      (Maint) Color console output when the win32console gem is installed

Joshua Harlan Lifton (6):
      Merged 2.6.x into 2.7x
      Merge remote-tracking branch 'lifton/2.7.x'
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      (#7110) Better SSL error message certificate doesn't match key
      (#7110) Better SSL error message certificate doesn't match key

Jude Nagurney (1):
      (#8062) Consider package epoch version when comparing yum package versions

Justin Stoller (1):
      Prior to this commit we hard coded paths in two tests that depended on

Kelsey Hightower (68):
      (#10940) Deprecate `--apply` in favor of `--catalog`
      (#11115) Support spec tests under rspec 2.7.x
      (#7656) Port PMT codebase into Puppet core
      (#7656) Port PMT generator templates into core
      (#7656) Add new PMT settings to core Puppet
      (#7656) Port PMT test fixtures into Puppet core
      (#7656) Port PMT unit test into Puppet core
      (#7656) Port PMT integration test into Puppet core
      (#7656) Port PMT to faces, bundle in Puppet core
      (#7656) Add build action to module_tool face
      (#7656) Add changes action to module_tool face
      (#7656) Add clean action to module_tool face
      (#7656) Add generate action to module_tool face
      (#7656) Add install action to module_tool face
      (#7656) Add search action to module_tool face
      (#7656) Remove unnecessary require of puppet/face
      (#7656) Bump module face to version 1.0.0
      (#7656) Refactor the module face build action
      (#7656) Fix inaccurate comment in the build action
      (#7656) Add output to action examples
      (#7656) Show the format of the status hash for build
      (#7656) Code cleanup for the generate action
      (#7656) Show the default install-dir in help output
      (#7656) Use Metadata fully qualified module name
      (#7656) Use a Puppet setting for default module repo
      (#7656) Rename contact to make_http_request
      (#7656) Use rspec 2.x in generator templates
      (#7656) Removed spec.opts template
      (#7656) Rename full_name to full_module_name
      (#7656) Rename `Modulefile` to `ModulefileReader`
      (#7656) Update comment string in the metadata module
      (#7656) Cleanup repository_spec tests
      (#7656) Encourage documenting license, and contact
      (#7656) Remove redundant uri module
      (#7656) Replace SystemExit with better exceptions
      (#7656) Use core Puppet semver.rb lib
      (#7656) Add details about module testing to templates
      (#7656) Rename module_tool face to module
      (#11198) Modulefiles should have a default license
      Merge pull request #256 from ody/ticket/2.7.x/11273_init.pp_template_for_module_face_should_be_more_thorough
      (#11958) Improve error msg for missing pip command
      (#11803) Add uninstall action for the module face
      (#11804) Enhance PMT search action output
      (#8701) waitforcert param configurable for puppet agent
      (#12244) All forge interactions should be centralized
      (#12106) Enhance the uninstall PMT action for UX
      (#12106) Enhance the uninstall PMT action for UX
      (#12645) Face actions should be able to set exit codes
      (#12256) module_requirements should include versions
      Merge pull request #583 from nfagerlund/ticket/2.7.x/3022_force_attribute
      (#3581) Stop forking around: Add fork helper method
      (#9167) Do not send email when nothing changes
      (#13737) Swap build_tree and format_tree method names
      (#13638) Add SemVer#pre function
      (#13639) Don't send errors directly to stderr
      (#13642) Move search notice message
      (#13643) Make the use of FileUtils.rm_rf secure
      (#13649) Restrict module name matching
      (#13636) Update Module Face copyright date
      (#9167) Do not send email when nothing changes
      (#8235) Add plug-in system for tools like Hiera
      (#8235) Improve Hiera data_binding test coverage
      (#14348) Hiera is the default data binding terminus
      (#14391) Fix inaccurate message from Hiera data lookups
      (#14424) Expand path of the target directory
      Merge branch '2.7.x'
      Revert "Merge branch '2.7.x'"
      (maint) Manually resolve broken merge of 2.7.x

Ken Barber (3):
      (#8312) Fix zypper provider so ensure => 'latest' now works
      (#8312) Fix zypper provider so ensure => 'latest' now works
      (#13651) Use magenta, not purple in Facter::Util::Colors

Koen Wilde (2):
      (#6697) Set service provider default path to /etc/rc.d on Archlinux
      Fix description in service provider test for FreeBSD

Konrad Scherer (2):
      (#7485) Support zypper 0.6 with zypper package provider
      (#7485) Support zypper 0.6 with zypper package provider

Lauri Tirkkonen (4):
      (#8465) Support SSL in HTTP report via HttpPool
      (#8465) Fix args to http_instance in spec
      (#8465) Test for SSL if using https reporturl
      (#12981) Fix external subcommand exit status

Luke Kanies (23):
      (7080) Adding json support to Indirector Request
      Adding json support to Puppet::Node
      Making Fact json handling more resilient
      Switching to use of json matchers
      (#7080) Registering PSON document types
      Merge branch 'tickets/master/7080-serializable_indirector_requests'
      Adding []/[]= support to Scope
      Adding default environment to Scope
      Resource type defaults cleanup
      Adding Scope#include? method
      Adding Scope#each method
      Improving an error message
      Cleanup up a small amount of whitespace
      Fixing default parameter value assignment
      Cleaning up indentation in versoncmp function
      Making the Functions module more resilient
      Removing an unnecessary stub in the Scope tests
      Fixing a failing test because of mismatched error string
      Scope[] now returns nil for undefined variables
      Merge branch 'refactor/master/8232-array_indexers_on_scope'
      Removing resource stubbing from launchd tests
      (2056) Launchd now supports overriding stop/start
      (6404) Failing when no file is specified to backup

Matt Robinson (66):
      Merge branch '2.7.x'
      maint: Fix inspect help
      maint: Add inspect app options to help
      Merge branch 'ticket/2.7.x/maint-fix_inspect_help' into 2.7.x
      maint: Fix case sensitive require
      Merge branch 'ticket/2.7.x/maint-fix_inspect_help' into 2.7.x
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      maint: Fix order dependent spec failure
      Merge pull request #49 from nfagerlund/maint/2.7.x/filebucket_type_and_wrapping
      Merge pull request #48 from daniel-pittman/maint/2.7.x/strip-incorrect-rights-statements
      (#8667) Write out a list of resources that are managed by puppet agent
      Merge branch 'ticket/2.7rc/8667-write_managed_resources' into 2.7rc
      (#4549) Fix templates to be able to call all functions
      (#9775) Only list managed resources in the resources file
      (#9837) Start the cleanup of the puppet resource application
      (#9837) Extract methods from the main section of the resource application
      (#9837) Call puppet apply to avoid deprecation warning
      (#9837) Make a clearer variable name in the specs
      (#9837) Move properties in prep to move proc to method
      (#9837) Move resource formatting method to Puppet::Resource
      (#9837) Split parameter pruning from manifest formatting
      (#9838) Return the tranaction report when doing a ral save
      Merge branch 'maint/2.7.x/provider_parameter_description' of https://github.com/nfagerlund/puppet into 2.7.x
      Merge branch '2.7.x'
      maint: Rename xgenerate to add_dynamically_generated_resources
      Give variables more descriptive names
      Merge pull request #223 from nicklewis/ticket/2.7.x/6907
      Merge pull request #244 from kelseyhightower/ticket/2.7.x/7656_module_tool_should_be_a_face
      (#11276) Mark module tool tests as failing on Windows
      (#11276) Fix module install specs that fail on windows
      maint: Add tap to fix Ruby 1.8.5 failures
      (#11552) Remove TransObject and TransBucket
      (#11595) Delete unused activerecord catalog find
      (#8296) Remove XMLRPC code
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      Fix augeas_spec branch merging mistake
      (#11552) Fix `puppet resource` ability to display parameters
      maint: Remove Module.modulepath
      maint: Remove unused method requires
      maint: Fix Puppet::Node::Environment::Helper specs
      maint: Cleanup environment_spec
      (#11802) Make Puppet::Module able to find module in specific path
      (#11803) Add modules_by_path method to environments
      (#11802) Add module list action
      (#11802) Fix module list specs on Windows
      (#11600) Remove module face
      Revert "(#11600) Remove module face"
      (#2279) Convert package specs to not use mocks
      (#2279) Handle providers with multiple installed versions - ruby gems
      (#12329) Allow faces when_rendering blocks to take options
      (#12349) Add module dependency errors to module list output
      (#12349) Order module list output
      (#12349) Order stderr output to fix acceptance test for `module list`
      Merge pull request #501 from kelseyhightower/ticket/2.7.x/12645_face_actions_should_have_the_ability_to_set_specific_exit_codes
      (#12424) Update SemVer to use ranges and new comparison operators
      Update module and environment with functionality for the module tool
      (#12256) Fix SemVer's range behavior to work with Ruby 1.9
      Fix range intersection monkey patch :& alias
      (#12631) Remove puppet module face
      Fix a test that tries to create a dir with '*' in the name
      Fix spec ordering failure on environment
      Monkey patch FileUtils.mv in Ruby 1.8.5
      Make core changes needed for the puppet module tool
      Add Module Tool

Matthaus Litteken (52):
      Revert "Merge pull request #99 from nigelkersten/tickets/2.7.x/9143-make-macauthorization-work-on-lion"
      Revert "Merge pull request #100 from glarizza/tickets/2.7.x/9192_launchd_fix"
      Merge branch '2.7.x' of github.com:puppetlabs/puppet into feature/master/7999-systemd-services
      Merge branch '2.7rc' into 2.7.x
      Merge branch 'feature/master/7999-systemd-services' into 2.7.x
      Updated CHANGELOG for 2.7.4rc1
      Merge branch '2.7rc'
      Update certificate_spec.rb test to include spec_helper
      Merge branch '2.7rc' of github.com:puppetlabs/puppet into 2.7rc
      Merge branch '2.7.x' into 2.7rc
      Updated CHANGELOG for 2.7.4rc2
      Merge branch '2.7rc'
      Merge branch 'ticket/2.7.x/7114fixup' of https://github.com/stschulte/puppet into 2.7rc
      Merge pull request #119 from nicklewis/ticket/2.7rc/8667-spec-fix
      (#9440) Allow cron vars to have leading whitespace
      Updated CHANGELOG for 2.7.4rc3
      Merge branch '2.7rc' into 2.7.x
      Merge branch '2.7rc'
      Expand paths in catalog_spec for windows testing
      Merge pull request #139 from glarizza/feature/2.7.x/launchd_optimization
      Merge pull request #186 from nicklewis/ticket/2.7.x/10346
      Merge pull request #187 from glarizza/feature/2.7.x/launchd_optimization
      Merge pull request #193 from daniel-pittman/feature/2.7.x/9508-auth-any-rather-than-auth-no
      Updating CHANGELOG for 2.6.13rc1
      Updating CHANGELOG for 2.7.8 release
      Merge branch '2.7rc' into 2.7.x
      Update CHANGELOG for 2.7.9 release
      Merge branch '2.7rc' into 2.7.x
      Updated CHANGELOG for 2.6.13
      Updating CHANGELOG and lib/puppet.rb for 2.7.11
      Updating CHANGELOG and lib/puppet.rb for 2.6.14
      Updating CHANGELOG and lib/puppet.rb for 2.7.11
      Merge branch 'puppet-2.7.11-cve+regression' of github.com:puppetlabs/puppet-cve-test into puppet-2.7.11-cve+regression
      Updating CHANGELOG again for 2.7.11
      Merge pull request #6 from pcarlisle/ticket/2.7.x/12572-last-run-summary
      Updating CHANGELOG and lib/puppet.rb for 2.7.12rc1
      Merge pull request #559 from cprice-puppet/bug/2.7.x/12844-agent-enable-doesnt-remove-old-lockfile
      Updating CHANGELOG for 2.7.12rc2
      Merge branch '2.7rc' into 2.7.x
      Updating puppet.spec for 2.7.11-1, 2.7.11-2
      Remove telnet Output_log parameter
      Updating CHANGELOG and lib/puppet.rb for 2.6.15
      Updating CHANGELOG and lib/puppet.rb for 2.7.13
      Merge branch 'security/2.7.13/filebucket-telnet-macos-security' into 2.7.x
      Merge branch 'security/2.6.14/filebucket-bucket-path-security' into 2.6.x
      Updating CHANGELOG and lib/puppet.rb for 2.6.16
      Update puppet.spec for rpm packaging
      Updating CHANGELOG, lib/puppet.rb for 2.7.14rc1
      Updating CHANGELOG for Puppet 2.7.14rc2
      Merge branch '2.7rc' into 2.7.x
      Merge pull request #758 from nfagerlund/maint/2.7.x/fix_man_pages
      Updating CHANGELOG, conf/redhat/puppet.spec, conf/redhat/rundir-perms.patch, and man pages for 3.0.0rc1 release.

Matthias Pigulla (5):
      (#9357) Delegate to install when upgrading MacPorts packages
      (#9768) Add a defaults argument to create_resources
      (#8314) Ignore variants in installed macports packages
      (#8319) Fix macports provider when ensure is latest but the package is not present
      (#8374) Make MacPorts provider ignore warnings from port command

Max Martin (7):
      Merge pull request #136 from mmrobins/ticket/2.7.x/dont_count_audited_resources_as_managed
      Merge pull request #149 from joshcooper/ticket/2.7.x/8411-change-group-broken
      Merge branch 'maint/2.7.x/resource_app_cleanup' into 2.7.x
      Merge branch '2.6.x' into 2.7.x
      maint: Deal with [].to_s problem in 1.9.2
      Merge branch '2.7.x'
      (#10109) Make resourcefile work with composite namevars

Merritt Krakowitzer (1):
      (#6371) Update lastchg field in shadow file on Solaris.

Michael Kincaid (2):
      Configure rcov and flay tests for metric_fu.
      Put the output in the user's TMPDIR, rather than the source tree.

Michael Stahnke (36):
      Merge pull request #44 from nfagerlund/ticket/2.7.x/8037_incorrect_augeas_example
      Merge pull request #77 from daniel-pittman/feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      Merge pull request #111 from haus/minor_cert_test_fix
      Update spec and lib/puppet.rb for 2.6.10 release
      Updated CHANGELOG for 2.6.10
      Update CHANGLEOG for 2.7.4
      Merge pull request #146 from daniel-pittman/bug/2.7.x/9832-storeconfigs-postgresql-regression
      Updating version numbers for 2.7.5
      Updates for 2.6.11
      Merge branch '2.6rc' into 2.6.x
      Merge branch '2.7rc' into 2.7.x
      Updated CHANGELOG for 2.7.6rc1
      Merge pull request #160 from daniel-pittman/bug/2.7.x/9832-storeconfigs-regressions
      Updated CHANGELOG for 2.7.6rc2
      Merge branch '2.7rc' into 2.7.x
      Updating for 2.7.6rc3
      Merge branch '2.7rc' into 2.7.x
      Updated CHANGELOG for 2.6.12
      Merge branch '2.6rc' into 2.6.x
      Updated CHANGELOG for 2.7.6
      Updated CHANGELOG for 2.7.7rc1
      Updated CHANGELOG for 2.7.7rc2
      Update CHANGELOG and packaging for 2.7.7 final
      Merge branch '2.7.x' into 2.7rc
      Merge branch '2.6.x' into 2.7rc
      Readying for 2.7.8rc release
      Updated CHANGELOG for 2.7.8rc1
      Merge pull request #318 from glarizza/bug/2.7.x/11202_apple_rake
      Updated CHANGELOG for 2.7.10rc1
      Merge branch '2.7.x' of github.com:puppetlabs/puppet into 2.7.x
      Merge pull request #350 from djm68/fix_11727_support_stdin_parsing_in_puppet_parser_validate
      Updated CHANGELOG for 2.7.10
      Merge branch '2.7rc' into 2.7.x
      Update packaging spec files for 2.7.12
      Update CHANGELOG for 2.7.12
      Merge branch '2.7rc' into 2.7.x

Michael Warren (1):
      (#12402) split log messages into individual lines before sending to syslog

Moses Mendoza (6):
      (#12169) Correct redhat spec changelog chronology issue
      (#12466) unset X-Forwarded-For header
      Update CHANGELOG for 2.7.14rc3
      Update CHANGELOG, spec files for 2.7.14
      Merge branch '2.7rc' into 2.7.x
      Update CHANGELOG lib/puppet.rb puppet.spec for 2.7.15rc1

Nan Liu (6):
      (#8814) Update fqdn_rand for ruby 1.9.2 rand bug.
      (#4135) Update pluginsync to only load ruby files.
      (#8547) Update storeconfigclean script to read puppet.conf
      (#6335) Allow optional trailing comma in argument lists.
      (#5353) Change agent default to graph=true
      (#14296) Improve template function error message.

Nicholas Hubbard (2):
      options[:ca_location] is a string not a symbol. Safer to pull Puppet::SSL::Host.ca_location since it is already set correctly.
      options[:ca_location] is a string not a symbol. Safer to pull Puppet::SSL::Host.ca_location since it is already set correctly.

Nick Lewis (180):
      Remove Puppet::Network::HttpPool keep_alive handling
      Merge branch 'remove-http-pool-keep-alive'
      Merge branch '2.7.x'
      Remove use of Util::Cacher in FileServing::Configuration
      Remove use of Util::Cacher from FileServing::Mount::File
      Remove unused require 'puppet/util/cacher' from Network::HttpPool
      Remove Util::Cacher usage from SSL::CertificateAuthority
      Remove Puppet::Util::Cacher usage from Puppet::Util::Settings
      Remove cached_attrs from Puppet::Type::File
      Remove caching from the catalog, types, and parameters
      Remove Puppet::Util::Cacher use from Puppet::Indirector::Indirection
      Remove dead uses of Puppet::Util::Cacher from autoloader
      Remove use of Puppet::Util::Cacher in Puppet::SSL::Host
      Rework Puppet::Util::Cacher to only expire using TTLs
      Merge branch 'remove-cacher'
      Don't use non-1.8.5-compatible methods 'Object#tap' and 'Dir.mktmpdir'
      Merge branch '2.7.x'
      (#8272) Fixup logging in Windows service provider
      (#8272) Use symbols instead of booleans for enabled property on Windows
      (#8272) Refactor specs for Windows service provider
      (#8272) Allow disabled Windows services to be started
      Merge branch 'ticket/master/8272'
      (#8408/8409) Add a Windows ADSI helper module
      (#8408) Add a default user provider for Windows
      (#8409) Add a default group provider for Windows
      Merge pull request #27 from ChaseMotorman/feature/master/8272-windows_service_support
      Stop trying to make config directories in Windows specs
      (#8662) Migrate suidmanager test case to rspec
      (#8770) Always fully drop privileges when changing user
      Merge pull request #32 from joshcooper/ticket/2.6.x/8740-cannot-manage-files-of-type-socket
      (#8770) Don't fail to set supplementary groups when changing user to root
      (#5495) Remove dead Windows-specific code from posix exec provider
      Merge branch 'ticket/2.7.x/5495' into 2.7.x
      Merge branch '2.7.x'
      Fix posix exec provider spec failures on Windows
      Merge branch 'ticket/2.7.x/5495' into 2.7.x
      Merge branch '2.7.x'
      Merge remote-tracking branch 'josh/maint/2.7.x/ca-location-test-failures' into 2.7.x
      Merge branch '2.7.x'
      Merge remote-tracking branch 'josh/maint/master/resource_and_suidmanager_specs'
      Remove Puppet::Network::HttpPool keep_alive handling
      Remove use of Util::Cacher in FileServing::Configuration
      Remove use of Util::Cacher from FileServing::Mount::File
      Remove unused require 'puppet/util/cacher' from Network::HttpPool
      Remove Util::Cacher usage from SSL::CertificateAuthority
      Remove Puppet::Util::Cacher usage from Puppet::Util::Settings
      Remove cached_attrs from Puppet::Type::File
      Remove caching from the catalog, types, and parameters
      Remove Puppet::Util::Cacher use from Puppet::Indirector::Indirection
      Remove dead uses of Puppet::Util::Cacher from autoloader
      Remove use of Puppet::Util::Cacher in Puppet::SSL::Host
      Rework Puppet::Util::Cacher to only expire using TTLs
      (#8272) Fixup logging in Windows service provider
      (#8272) Use symbols instead of booleans for enabled property on Windows
      (#8272) Refactor specs for Windows service provider
      (#8272) Allow disabled Windows services to be started
      (#8408/8409) Add a Windows ADSI helper module
      (#8408) Add a default user provider for Windows
      (#8409) Add a default group provider for Windows
      Stop trying to make config directories in Windows specs
      (#5495) Remove dead Windows-specific code from posix exec provider
      Fix posix exec provider spec failures on Windows
      Don't use non-1.8.5-compatible methods 'Object#tap' and 'Dir.mktmpdir'
      Merge pull request #52 from joshcooper/maint/2.7.x/ssl-file-spec-test-failure
      Merge pull request #53 from joshcooper/ticket/2.7.x/8662-root-on-windows
      maint: Fix trailing whitespace in lib/puppet/util.rb
      (#8410) Add a helper to Puppet::Util to determine absoluteness of a path
      (#8410) Use absolute_path? for Puppet::Parameter::Path validation
      (#8410) Cleanup and fix Windows support in Puppet::Util.execute
      (#8410) Factor out a base class for exec providers
      (#8140) Add an exec provider for Windows
      Merge branch '2.7.x'
      Properly determine file deletion in puppet/unit/util_spec.rb
      (#8489) Use File::PATH_SEPARATOR rather than ':' for args to puppet doc
      (#8489) Use File::PATH_SEPARATOR rather than ':' for factpath setting
      (#8489) Use File::PATH_SEPARATOR for path attribute of exec type
      (#8489) Use File::PATH_SEPARATOR in path attribute of service type
      (#9174) Provide a helpful error when missing a gem and installing on Windows
      (#8413) Properly clean up stale pidfile on Windows
      Merge pull request #64 from jhelwig/tickets/2.7.x/8412-install-msi-on-windows-via-package-type
      Merge pull request #75 from joshcooper/ticket/2.7.x/8662-elevated-priv-check-fails-on-2k3R2
      (#8413) Only try to catch Process::Error if it's defined
      Merge pull request #98 from daniel-pittman/feature/2.7.x/9051-storeconfig-backend-should-be-configurable
      Merge pull request #97 from joshcooper/ticket/2.7.x/9186-windows-file-security
      Merge remote-tracking branch 'josh/maint/2.7.x/9186-fix-shared-examples' into 2.7.x
      Fix order dependent spec failure in exec specs
      Fix failing spec for resource file
      Merge pull request #122 from haus/ticket/9440
      Cleanup and improve coverage of file type unit tests
      Cleanup file type integration tests
      Remove unnecessary Windows-on-non-Windows-master code for path parameter
      Refactor autorequire of parent to use pathname with ancestors
      Sub away trailing backslashes at the end of sources on Windows
      Move mode management into the providers
      Add the ability to retrieve user and group SIDs
      Make string_to_sid_ptr block optional
      Move owner management into providers
      Remove duplicate SID resolution code
      Move group management into providers
      Merge pull request #151 from joshcooper/ticket/2.7.x/9027-groupadd-aix-warning
      (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
      (#2848) List subject alt names in output of puppet cert --list
      (#2848) CSR subjectAltNames handling while signing.
      (#2848) Remove unused xmlrpc code
      (#2848) Rework the xmlrpc CA handler to use the modern SSL code
      (#2848) Remove the legacy SSLCertificates code
      Add support for dns-alt-names option to `puppet certificate generate`
      Add --allow-dns-alt-names option to `puppet certificate sign`
      Add support for DNS alt names to `puppet ca`
      Fix some inconsistencies from merging
      Fix failing CA Interface specs on Ruby 1.9
      (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
      (#2848) List subject alt names in output of puppet cert --list
      (#2848) CSR subjectAltNames handling while signing.
      (#2848) Remove unused xmlrpc code
      (#2848) Rework the xmlrpc CA handler to use the modern SSL code
      (#2848) Remove the legacy SSLCertificates code
      Backport Enumerable#count to Rubies < 1.8.7
      Allow a master to bootstrap itself with dns_alt_names and autosign
      Allow a master to bootstrap itself with dns_alt_names and autosign
      (#10244) Restore Mongrel XMLRPC functionality
      (#10244) Restore Mongrel XMLRPC functionality
      (maint) Fix CA-related specs failing on Windows
      (#10289) Add a safe alternative to REST for inventory service
      (#10346) Fix storeconfigs spec failures when run alone
      Merge branch '2.6.x' into 2.7.x
      Merge branch '2.7.x'
      (#10289) Add an ext script to upload facts to inventory server
      maint: Fix failing spec on old version of rspec
      Merge branch 'ticket/2.7.x/2744' into 2.7.x
      Merge remote-tracking branch 'daniel-pittman/feature/2.7.x/9508-auth-any-rather-than-auth-no' into 2.7.x
      maint: Correct the spelling of sentinel
      (#9671) Use Array#concat rather than +=
      maint: Don't File#expand_path when unmunging file paths
      (#9617) Be smarter about finding parents when eval_generating
      (#9671) Exit early from #eval_generate if nothing is created
      (#9671) Generated resources should not depend on the completed_ whit
      (#9617) Keep track of blockers for resources when traversing
      (#9617) Add a red-black tree map
      (#9671) Stop tracking size and height of nodes in RbTreeMap
      (#9671) Return nodes from internal RbTreeMap recursion
      (#9671) Implement RbTreeMap#each recursively, and #first/#last explicitly
      (#9617) Use an RbTreeMap to store ready resources
      maint: Fix failing specs for Windows exec provider
      maint: Fix incorrect whitespace
      (#6907) Allow providers to be selected in the run they become suitable
      (#6907) Prefetch unsuitable providers
      (#2744) Don't automatically enable show_diff in noop mode
      Merge pull request #246 from pcarlisle/fix_validate_args
      Don't try to read the body of a file content response twice
      Fix failing acceptance test in resource/file/source_attribute.rb
      Fix Ruby 1.8.5-incompatible code in spec setup
      Fix Ruby 1.8.5-incompatible code in Transaction#eval_generate
      Fix Ruby 1.8.5-incompatible code in FileBucket::Dipper spec
      Merge branch 'fix-1.8.5-incompatibilities' into 2.7rc
      maint: Unify 'type' and 'classref' non-terminals in the grammar
      (#6710) Support relationship arrows between resource refs with title arrays
      (#6710) Support relationships for resources defined by other constructs
      Merge branch '2.7.x'
      (#11641) Properly track blockers when generating additional resources
      Fix stage inheritance between multiple included classes
      Allow storeconfigs collector to accept parser resources
      Copy owner/group in replace_file
      Document uid/gid-related methods in Puppet::Util
      Remove unnecessary fallbacks in change_{user,group}
      Copy owner/group in replace_file
      Document uid/gid-related methods in Puppet::Util
      Remove unnecessary fallbacks in change_{user,group}
      Disable replace_file on Windows
      Merge tag '2.7.11' into 2.7.x
      Merge tag '2.6.14' into 2.6.x
      Merge commit '7c5d1e4' into 2.7.x
      (#11988) Don't overwrite symlinks in augeas provider
      (#11988) Don't overwrite symlinks in augeas provider
      Provide a helpful error message when name resolution fails
      Revert "Provide a helpful error message when name resolution fails"
      Merge pull request #589 from jeffweiss/ticket/master/13296_unless_in_exec_causes_syntax_error
      Quote strings containing hex numbers when generating ZAML
      Significantly improve compilation performance when using modules
      Fix unit test failure in fileserver due to modules

Nick Stokoe (1):
      puppet apply manual - correct inconsistent example of using config params as options

Nigel Kersten (5):
      Fixes #9143, allows macauthorization provider to work on OS X Lion 10.7
      Merge pull request #100 from glarizza/tickets/2.7.x/9192_launchd_fix
      Merge pull request #99 from nigelkersten/tickets/2.7.x/9143-make-macauthorization-work-on-lion
      Fixes #9143, allows macauthorization provider to work on OS X Lion 10.7
      (#10722) Display errors on HTTP report submission failures

Ossi Herrala (1):
      (#8855) Follow HTTP redirects is {app,pkg}dmg providers.

Patrick (3):
      (#8296) Remove logic around XMLRPC vs REST protocols
      (#11741) Use dns_alt_names instead of certdnsnames in acceptance tests
      Match old slightly different version of "hostname was not match"

Patrick Carlisle (166):
      Merge branch '9357-macports-install'
      Merge branch '7004-plural-e' into 2.7.x
      Fix arity of blocks to validate for file properties
      Merge branch '5421' into 2.7.x
      Fix tests for autorequiring links to work on windows
      Fix the targets in autorequire tests to use expand_path
      Merge remote-tracking branch 'stschulte/feature/2.7.x/9997' into 2.7.x
      Merge remote-tracking branch 'nanliu/ticket/2.7.x/8547' into 2.7.x
      (#6830) Fix create_resources spec for ruby 1.9
      Merge branch '9768_default_resources' into 2.7.x
      Merge branch 'tickets/master/10064'
      Merge remote-tracking branch 'daniel-pittman/bug/2.6.x/9158-support-multiple-versions-of-stomp-gem' into 2.7.x
      (#6830) Fix macports provider under ruby 1.9.2
      Merge branch 'fix-macports'
      Fix tests for MacPorts provider when MacPorts is not installed
      Merge branch '10321-rangearray' into 2.7.x
      Merge remote-tracking branch 'daniel-pittman/feature/2.7.x/4865-notify-start-of-evaluation-not-just-end' into 2.7.x
      (#4865) Log when we start evaluating resources at the info level
      Merge branch '4865-notify-start-of-evaluation' into 2.7.x
      Merge remote-tracking branch 'jhelwig/tickets/2.7.x/8062-yum-epoch' into 2.7.x
      Merge branch 'tickets/2.7.x/11333-fix-ensurable' into 2.7.x
      (#7428) Fix option parsing for ruby 1.9 in cert application
      Merge branch 'tickets/master/10950'
      Merge branch 'tickets/2.7.x/8119' into 2.7.x
      (#8341) Only load facts once per puppet run
      (#12060) Remove factsync
      (#11858) Don't load plugins during sync.
      Revert "(#11858) Don't load plugins during sync."
      (#12101) Add shared context for specs to imitate windows or posix
      (#12101) Make Puppet::Util::absolute_path? usable in autoloader
      Revert "(#12101) Make Puppet::Util::absolute_path? usable in autoloader"
      Revert "(#12101) Add shared context for specs to imitate windows or posix"
      (#12127) Implement local pluginsync from modulepath for puppet apply
      (#12127) Add acceptance test for pluginsync on puppet apply
      (#12268) Fix upstart test to work with String#each_line
      (#2244) Plugin mount return a directory if modulepath is valid but has no plugins
      (#2244) Remove nil results from remote file recursion
      (#5521) Enable pluginsync by default
      (#12464) Avoid unnecessarily reloading facts when node_name_fact is not set
      Clear deprecation warnings after each test.
      (#12310) Remove process_name instrumentation listener
      (#12464) Avoid unnecessarily reloading facts when node_name_fact is not set
      (#12310) Remove process_name instrumentation listener
      (#12572) Revert fix for #7106 and implement a more minimal fix
      (#12572) Add acceptance test to make sure no last_run_summary diff is printed
      (#12572) Fix failing last run summary test on windows
      Merge branch '2.7.x'
      Fix Windows test that was broken in merge from 2.7.x.
      Merge branch '2.7.x'
      Merge pull request #515 from cprice/cleanup/master/improved-logging-during-plugin-loading
      (#12126) Rename loaded to mark_loaded to avoid conflict with new accessor
      (#12126) Improve autoloading specs
      (#12126) Refactor Puppet::Util::Autoload
      (#12126) Track mtime of autoloaded files
      (#12126) Implement reloading changed files
      Remove Puppet::Util::Autoload::FileCache.
      (#12126) When reloading files detect changes anywhere in the load path
      (#12126) Remove unnecessary searchpath method
      (#11858) When syncing plugins, use autoloader to reload changes
      (#12126) Mark a file as loaded when starting to load instead of after
      (#12126) Use $LOADED_FEATURES instead of $" in autoloader.
      (#12126) Normalize path names to avoid unnecessary reloading
      (#12126) Update comments in Autoload to reflect reality
      (#12126) Fix autoload spec on windows
      (#9491) Preserve trailing slashes in FileSettings
      Merge branch '2.7.x'
      (#12891) Make features reloadable
      (#12763) Use autoloader for each face's actions
      (#12763) Allow actions to be redefined in faces
      (#12882) Make functions reloadable
      (#12126) Fix autoload for ruby 1.8.5
      Fix up2date spec for ruby 1.8.5
      (#10722) Refactor http_spec to use expectations
      (#10722) Add spec to verify that an error is logged on bad http
      Merge branch '2.7.x'
      Fix order dependent spec failure caused by formats_spec
      (#3910) Include environment in catalog
      Remove unused clear method in configurer
      (#3910) Make puppet agent use environment specified in catalog
      (#3910) Acceptance tests for environments and ENC
      Merge branch '2.7.x'
      (#13117) Fix selmodule error on each_lines
      Stub execpipe using StringIO
      Merge remote-tracking branch 'daniel-pittman/refactor/2.7.x/4862-remove-the-event-loop-library' into 2.7.x
      (#12101) Add shared context for specs to imitate windows or posix
      (#12101) Make Puppet::Util::absolute_path? usable in autoloader
      (#13260) Use mktmpdir when downloading packages
      Refactor pkgdmg specs
      Refactor pkgdmg specs
      (#13260) Use mktmpdir when downloading packages
      (#13260) Spec test to verify that mktmpdir is used
      (#13260) Spec test to verify that mktmpdir is used
      Stub mktmpdir and remove_entry_secure in os x package providers
      Stub mktmpdir and remove_entry_secure in os x package providers
      (#13659) Convert fact values to string when searching database
      Merge branch '2.7.x'
      Fix loading of faces in specs
      Merge branch '2.7.x'
      (#13640) Only agents should use next_agent_run
      Use :as_platform in the redhat service spec
      Use :as_platform in the smf service spec
      Fix communication_error acceptance test
      Merge remote-tracking branch 'cprice/refactor/2.7.x/13690-spec_helper_compatibility' into 2.7.x
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Merge 2.7.x merge branch into master
      (#13299) Fix error message when agent is disabled
      Put back require 'puppet' in Puppet::Util
      Skip pluginsync in puppet apply if no modulepath
      (#3910) Add acceptance test for case of enc that doesn't specify environment
      (#3910) Use the requested environment of node as default in exec terminus
      Rename dostorage to init_storage
      Refactor removing prepare in configurer
      Clean up the exec indirection terminus
      (#3910) Query node before fetching catalog to determine environment
      (#3910) Set environment locally in configurer
      (#3910) Thread environment through plugin downloader
      (#3910) Give environment in indirection calls in configurer
      (#3910) Use catalog's environment when fetching file content
      Make positional arguments distinct in Request#initialize
      (#3910) Give environment as argument to indirection requests
      (#3910) Default to no cache for nodes on master
      Fix file path used in enc acceptance test
      (#3910) Add nodes to auth.conf in acceptance tests
      Add default_file_terminus setting
      (#13966) Remove remaining uses of :name setting
      Munge settings in value instead of set_value
      (#14229) Add a path type to settings
      Remove type hack from file settings
      Use expand_path to normalize paths in autoloader
      Fix filebucket specs on Windows
      Fix incorrect argument handling for expire in NodeExpirer
      Fix #14123 for Windows
      Update use of reparse to reparse_config_files
      Revert "Fix incorrect argument handling for expire in NodeExpirer"
      Merge branch '2.7.x'
      (#13341) Add wrapped exceptions
      (#13341) Log nested exceptions
      Don't use features to check for color in logging
      Add Puppet::Util::Platform to abstract platform checks
      Merge branch '2.7.x'
      Fix a stub of ansicolor that I missed
      (#13858) Use current environment when loading types
      Merge branch '2.7.x'
      Remove deprecated standalone executables
      Fix loading of constant_inflector
      Remove the standalone puppet executables in sbin
      Remove manpages for legacy executables that are gone
      Remove references to legacy executables in the code
      Revert "maint: use relative paths to fixtures."
      Merge remote-tracking branch 'daniel-pittman/bug/master/14322-puppet---version-doesn't-work' into bug/master/14322-puppet---version-doesn't-work
      Split out the basic setting behaviors into BaseSetting
      Create an exception hierarchy for settings
      Move settings out of util
      Move rubygems require to executable entry points to Puppet
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Interpret global version option only if no subcommand
      Set node_terminus in device application
      Use absolute_path in module install spec
      Use ExternalFileError when a file name and line are needed
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Remove duplicated buggy fail definition
      Add debugging in environment acceptance test
      Restart master for each agent in ENC test to get around caching

Paul Mucur (1):
      Add pkgin package provider

Paul Tinsley (1):
      (#11717) Set password before creating user on Windows

Peter Meier (3):
      Revert "(Maint.) Disable cleaning of storeconfigs."
      Fix tests for #1886 with ActiveRecord 3.x
      Possible fix for #8435 - remote package installation broken

Piavlo (1):
      (Bug #11281) Correct Fix of undefined method `file?' for Puppet::Type::File:Class with ruby 1.9.2

Pieter van de Bruggen (5):
      (#12339) Adding basic search output formatting.
      (#12339) Improving documentation around Puppet::Util::Terminal.width.
      (#12339) Clarifying source attribution.
      (#12080) Implement a rich console logging prototype.
      (#13367) Patch SemVer to permit ranges including pre-release components.

R.I.Pienaar (3):
      (#5246) Puppetd does not remove it's pidfile when it exits
      Merge pull request #436 from daniel-pittman/maint/2.7.4/stub-upstart-spec-test-in-a-portable-way
      Revert "(#5246) Puppetd does not remove it's pidfile when it exits"

Reid Vandewiele (1):
      (#13567) Fix create_resources name parameter bug

Ricky Zhou (4):
      Fixes #8119 - Write to a temporary file and move when storing reports.
      Drop privileges before creating and chmodding SSH keys.
      Drop privileges before creating and chmodding SSH keys.
      (#8119) Write reports to a temporary file and move them into place

Russ Allbery (1):
      Updates and bug fixes to puppet-mode.el

S. Zachariah Sprackett (2):
      Add stdin parsing to puppet parser validate
      Add gitignore to default puppet module

Sean Millichamp (9):
      (#10328) Add 'weekday' parameter to schedule type
      (#10321) Fix array support in schedule's range parameter
      (#10328) Convert class variable to instance variable
      (#10296) Switch schedule tests from should to must
      (#13054) Add day-spanning support to schedule's range parameter
      (#13054) Fix spanning days with day-of-week in schedule
      Tidy up ScheduleTest includes in schedule spec tests
      (#7639) Assume unspecified time components are zero
      (#7639) Tests covering edge cases testing schedule boundaries

Stefan Schulte (39):
      (#7114) Add tests for option property
      (#7114) Fix value validation on options
      (#8193) Support new keytypes for ssh_authorized_key
      (#8193) Support new keytypes for sshkey
      Merge branch 'ticket/2.7.x/4135' of https://github.com/nanliu/puppet into 2.7.x
      Merge branch 'array-to_s-1.9-stable' of https://github.com/5long/puppet into 2.7.x
      (#9796) ssh_authorized_key supports whitespace again
      (#8193) Add unit tests for new ssh keytypes
      (#8193) Add support for new ssh keytypes in authorized_key provider
      (#9997) Add mysql2 gem support
      Merge branch 'tickets/2.7.x/6371-update-lastchg-shadow-field-on-solaris' of https://github.com/jhelwig/puppet into 2.7.x
      (#9544) Stub command in package spec that needs root priviledges
      (#5421) Link should autorequire target
      maint: Fix indention in cron spec
      maint: Remove unused vars in cron spec
      maint: Use a real provider class in cron spec
      maint: Add expected error messages to cron spec
      (#12070) Fix crontab value munging
      Merge branch 'schedule/bug/10296-test_cleanup_2.7.x' of git://github.com/seanmil/puppet into 2.7.x
      Revert "Finer-grained protocol for property `insync?`."
      Merge branch 'tickets/2.7.x/12195-Puppet_outputs_Ruby_warnings_on_RHEL_directives' of git://github.com/barn/puppet into 2.7.x
      Merge pull request #426 from daniel-pittman/bug/2.7.x/12268-1.9.3-compatibility-fix
      Merge pull request #514 from nfagerlund/typo/2.7.x/seperated
      Maint: Remove unused variable in user spec
      Maint: Add a real provider class to user spec
      Maint: Use real objects in user spec
      Maint: Remove unused mock objects in user spec
      (#1076) Show warning if an empty group is specified
      (#7986) Cleanup pkg provider #1
      (#7986) Cleanup pkg provider #2
      (#7986) Modify pkg provider to handle publisher
      (#12960) Fix puppet resource <type> if type has no providers
      (#13645) Do not open a smtp connection if nothing to report
      (#13645) Add test cases to tagmail_spec
      maint: refactor integration specs for ssh_authorized_key
      (#14127) Add integration tests for ssh_authorized_key
      maint: Fix pkg_spec test
      (#11004) Support Solaris 11 output in pkg package provider
      (#11004) Fix regex for pkg provider line matching

Stig Sandbeck Mathisen (5):
      Merge commit '2.7.2rc1' into experimental_upstream
      Merge commit '2.7.3rc1' into experimental_upstream
      Imported Upstream version 2.7.5
      Merge branch 'upstream' into experimental_upstream
      Imported Upstream version 3.0.0~rc1

Tim Bielawa (1):
      Fix specfile to account for removal of XMLRPC code in commit 81c73fd0.

Tim Bishop (5):
      (#11318) Add password management on FreeBSD
      (#10962) Make sure managehome is respected on FreeBSD
      (#11046) Improve pw group provider on FreeBSD
      (#11046) Add support for user expiry in pw user provider
      (#12081) ensure user deletes respect managehome

Uwe Stuehler (1):
      More details in metaparameter redefinition warning

Whyme.Lyu (7):
      Call Array#join explicitly on command
      Be specific when stubbing @resource[:name]
      Use pacman -U to install from source
      Accept URL as pacman package source
      Make the URL part of pacman_spec DRY
      Sync database before installing from source
      Use actual package instance instead of stub

Zach Leslie (1):
      (#7296) Make the Debian service provider handle services that don't conform to the debain policy manual.

codec (1):
      (#10907) default for exec provider log output is on_failure

cprice (40):
      (#12309) Refactor deprecated uses of Util.execute
      (#12309) Fix broken rspecs
      (#12309) Fix broken module_spec.rb
      (#12359) Improve logging of backtraces
      (#12454) device_spec.rb fails with ruby 1.8.7-p357 and mocha v.0.9.12
      (#12336) Util::'which' may fail if user's path contains a tilde
      (#12490) execution_spec causes failures on windows
      (#12454) device_spec.rb fails with ruby 1.8.7-p357 and mocha v.0.9.12
      (#12490) fixing windows spec tests
      (#5454) Acceptance test to verify that pluginsync works properly with "features"
      (#5454) add "autosign" argument
      Fix a few acceptance tests that were checking stderr
      Clean up deprecation warning
      re-fix acceptance test related to logging changes
      Extra debug logging during plugin loading
      (#7316) Initial acceptance tests
      Fix backups_spec, which fails if run by itself
      (#3324) Ported yumrepo unit tests to spec
      (#12844) Backwards compatibility for 'puppet agent --enable'
      Fix ruby 1.8.5 failures for execution_spec
      More fixes / cleanup for 1.8.5
      Revert "(#12844) Backwards compatibility for 'puppet agent --enable'"
      Revert "Merge remote-tracking branch 'masterzen/tickets/2.7.x/3757' into 2.7.x"
      (#12844) Agent lockfiles: backwards compatibility with 2.7.10/2.7.11
      (#12933) Better error message when agent is administratively disabled
      (#12844) Fix a unit test relating to lockfiles
      (#7749) Reduce weird scope cycles when bootstrapping settings
      Add lib_trollop.rb, an alternative implementation of an option / cli parser
      (#7749) Parse command line args and config file before loading app/face
      (#7749) Improvements to handling settings, bootstrapping puppet
      (#7749) get rid of "set_run_mode" method in Application class
      (#7749) get rid of $puppet_application_name and $puppet_application_mode globals
      (#7749) rename "Settings#setdefaults" to "define_settings"
      (#7749) doc / tests cleanup
      Add comment with URL of upstream pull request for trollop
      (#13439) refactor spec helper for spec compatibility between 2.7 and
      Merge branch '2.7.x'
      (#13439) refactor spec_helper for spec compatibility between 2.7 and
      remove literal tabs from defaults.rb
      Add ability to filter resource_type output by type

joshcooper (3):
      Merge pull request #63 from nicklewis/ticket/2.7.x/9174
      Merge pull request #74 from nicklewis/ticket/2.7.x/8413
      Merge pull request #90 from nicklewis/fix-pidlock-removal-failure

lifton (11):
      Merge pull request #157 from nfagerlund/maint/2.7.x/document_multiple_tags
      Merge pull request #284 from MaxMartin/ticket/2.7.x/10109-composite-namevars
      Merge pull request #336 from joshcooper/maint/2.7.x/cert-ttl-build-errors
      Merge pull request #344 from daniel-pittman/refactor/2.7.x/11996-spec-failures-after-ruby-187-p357
      Merge pull request #342 from daniel-pittman/refactor/2.6.x/11996-spec-failures-after-ruby-187-p357
      Merge pull request #397 from mmrobins/ticket/2.7.x/2279-gem_reinstalls
      Merge pull request #420 from daniel-pittman/feature/2.7.x/2927-symbolic-file-mode-redux
      Merge pull request #446 from joshcooper/ticket/2.7.x/12386-disable-kick-on-windows
      Merge pull request #471 from pcarlisle/clear_deprecations
      Merge pull request #498 from daniel-pittman/bug/2.7.x/6663-increase-default-key-length
      Merge pull request #573 from nicklewis/helpful-name-resolution-failure-message

nfagerlund (54):
      Maint: Fix poor documentation for versioncmp function.
      Maint: Adjust wording for file type's content parameter
      Maint: Mention that audit metaparameter will accept "all"
      (#7853) Clarify and complete docs for the tagmail report processor
      (#8302) Improve documentation of exec providers
      (#3553) Explain that cron resources require time attributes
      Maint: Fix missing option text in puppet agent and arrange options alphabetically
      (#4411) Explain that runinterval = 0 does not mean "never run"
      (#8612) Clarify the function of the example for exec's "creates" parameter
      (#8037) Fix incorrect example in Augeas type reference
      Maint: Improve create_resources function's doc string
      Maint: Fix line wrapping in create_resources function
      Maint: Correct docs for filebucket type and file's backup parameter
      Maint: Fix the "provider" parameter documentation
      Maint: Document tag metaparameter's ability to take an array
      Fix typo in report debug message
      (#7601) Use << instead of += in references
      (#7601) Rename "h" method to "markdown_header"
      (#7601) Remove unnecessarily abstracted paramwrap method
      Maint: Revise reference text for most types and providers
      (#7601) Add markdown_definitionlist method to reference.rb
      (#7601) Use definition lists in type references
      (#7601) Use definition lists in indirection references
      (#11291) Update description of show_diff setting to match behavior as of 2.7.8
      (#11291) Update description of show_diff setting to match behavior as of 2.7.8
      (#11404) Move markdown_header and markdown_definitionlist to Puppet::Util::Docs
      Maint: Make indentation for markdown definition lists more readable and reliable
      (#11404) Fix broken and unreliable indentation in provider lists in type reference
      Maint: Padding should be added when dochook strings are consumed, not hardcoded into them
      Maint: Fix redhatfedorasusecentosslesoelovm in type reference
      Maint: Fix typo in usage example for create_resources function
      (#11451) Fix improper use of "defined" in the duplicate declaration error
      Merge pull request #317 from jamtur01/tickets/2.7.x/11844
      (#12356) Mention the expected exit codes in the hasstatus parameter doc
      Maint: Configuration settings shouldn't be referred to as "parameters"
      Maint: Update external_nodes setting description for changes from 2.6.5
      (#11535) Platform agnosticism: Desc strings should refer to path separator instead of ':'
      (#11535) Call out differing config defaults on Windows
      Maint: Clarify ancient text about directories of symlinks
      Maint: Improve documentation of file type's source parameter
      Maint: General improvement of file type parameter doc strings
      (#2927) Document symbolic modes in mode parameter
      (#11535) Update file type with Windows-specific quirks
      (#11535) Update user type docs w/ Windows-specific quirks
      Maint: Kill bogus allowdupe compatibility warning for FreeBSD
      (#11535) Update group type's docs w/ Windows-specific quirks
      (#11535) Update service type w/ Windows-specific quirks
      (#11535) Update package type docs w/ Windows-specific quirks
      (#11535) Update Windows exec provider docs
      (#11535) Edit scheduled_task type docs
      Typo: "Seperated" -> "separated"
      (#3022) File type's force attribute's description is incomplete
      Fix broken man page rake task
      Maint: De-genericize Puppet Forge references in module face

pcarlisle (25):
      Merge pull request #543 from daniel-pittman/maint/2.7.x/test-failure-after-activerecord-cleanup
      Merge pull request #548 from cprice-puppet/cleanup/master/ruby-185-execution-spec-failures
      Merge pull request #549 from cprice-puppet/cleanup/master/ruby-185-execution-spec-failures
      Merge pull request #566 from daniel-pittman/maint/2.7.x/fix-pkg-provider-tests-on-1.8.5
      Merge pull request #568 from daniel-pittman/maint/2.7.x/12960-fix-order-dependent-test-failures-over-global-state
      Merge pull request #605 from cprice-puppet/cleanup/master/remove-tabs-from-defaults
      Merge pull request #602 from cprice-puppet/bug/2.7.x/13439-spec-api-incompatibility
      Merge pull request #603 from cprice-puppet/bug/master/13439-spec-compatibility
      Merge pull request #665 from cprice-puppet/bug/2.7.x/spec-tmpfile-cleanup
      Merge pull request #682 from zaphod42/bug/master/enc-variables-not-overridden-by-node
      Merge pull request #713 from daniel-pittman/bug/2.7.x/14173-filebucket-resource-should-validate-path
      Merge pull request #700 from daniel-pittman/bug/2.7.x/14123-don't-explode-when-path-has-bad-content
      Merge pull request #701 from daniel-pittman/bug/2.7.x/14127-ssh-auth-keys-fails-on-completely-empty-line
      Merge pull request #735 from daniel-pittman/bug/2.7.x/14288-gem-provider-fails-on-bad-input
      Merge pull request #763 from cprice-puppet/bug/2.7.x/help-faces-as-api
      Merge pull request #768 from nicklewis/fix-fileserver-test-failure
      Merge pull request #771 from zaphod42/bug/master/14387-user-agent-for-module-tool
      Merge pull request #776 from joshcooper/maint/2.7.x/fix-broken-console-color
      Merge pull request #781 from cprice-puppet/cleanup/master/windows-module-tool-spec-failures
      Merge pull request #783 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120515
      Merge pull request #784 from cprice-puppet/cleanup/2.7.x/module-dns-acceptance-failures
      Merge pull request #786 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120515
      Merge pull request #788 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120516
      Merge pull request #789 from cprice-puppet/cleanup/master/windows-acceptance-failures-20120516
      Merge pull request #792 from cprice-puppet/cleanup/2.7.x/vary-webrick-port

peter (1):
      Add documentation for puppet apply --noop

-----------------------------------------------------------------------

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list