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

Stig Sandbeck Mathisen ssm at debian.org
Mon Dec 17 19:10:24 UTC 2012


The annotated tag, upstream/3.0.1 has been created
        at  f9e4b9f2f3faba557f2d2bcdb06f89fe4740eaf6 (tag)
   tagging  c0c090bf0f3701e2deb21b82880cf69ad5f78ae3 (commit)
  replaces  upstream/2.7.19
 tagged by  Stig Sandbeck Mathisen
        on  Sat Oct 20 13:36:56 2012 +0200

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

iEYEABECAAYFAlCCjNgACgkQQONU2fom4u7ZLgCfcXT3an4kJ029vmcpN8FrLOKH
h3gAoJAPdZHeYWaYh//oRCbJ6TttnE8X
=MfLJ
-----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):
      (#15264) Custom title patterns can fail cryptically.

Andrew Parker (165):
      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
      Fixup tests to work on CentOS 5
      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
      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
      Merge remote-tracking branch 'upstream/2.7.x'
      Re-enable this test to work on windows
      Merge pull request #803 from kelseyhightower/ticket/3.0rc/14514_use_default_config_when_hiera.yaml_is_missing
      Merge pull request #814 from jeffweiss/maint/master/make_facter_2_hard_dep
      Merge pull request #815 from hkenney/ticket/master/3909_strip_trailing_dot_from_default_fqdn
      Merge remote-tracking branch 'upstream/2.7rc' into 3.0rc
      Merge pull request #819 from haus/update_redhat_init_scripts
      Merge pull request #820 from haus/update_gem_and_redhat_dependencies
      (Maint) Fix upstart provider to work on Ruby 1.9.3
      Merge remote-tracking branch 'upstream/2.7rc' into HEAD
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge pull request #840 from pcarlisle/ticket/master/14789-autoloader-loaded
      Merge pull request #843 from kelseyhightower/ticket/3.0rc/14900_data_bindings_does_not_support_hiera_puppet_backend
      (#14901) Refactored test to improve readability
      (#14901) Use the last argument when there are duplicates
      (#14901) Simplify argument handling in option parser
      (#14901) Consistent handling of argument parsing errors
      Merge pull request #848 from pcarlisle/ticket/master/environment-caching
      Merge pull request #855 from pcarlisle/ticket/3.0rc/environment-messages
      (#14844) Add test that execpipe works for upstart provider
      (Maint) Create a test for the puppet backend
      (Maint) Limit data binding API information
      Merge pull request #857 from pcarlisle/ticket/3.0rc/15024-mount-error
      Merge pull request #874 from cprice-puppet/feature/master/acceptance-test-util-libs
      Merge pull request #860 from zaphod42/maint/3.0rc/cleaner-bindings-api
      Merge pull request #835 from domcleal/tickets/3.x/14378
      Merge commit '11ae0fc' into 3.0rc
      Merge branch 'tickets/3.x/14136' of https://github.com/domcleal/puppet into 3.0rc
      (Maint) Fix up directories used in pluginsync test
      (Maint) Attempt to fix flickering test
      (Maint) Remove unused variables from ca tests
      (Maint) Remove unneeded checks from ca tests
      (Maint) Clarify what certs are being created in ca tests
      (Maint) Moved ca test to correct location
      (Maint) Clarify flow of CRL generation and update
      (Maint) Make a CRL valid on the same second it is updated
      (Maint) Fixed up acceptance tests for pluginsync on windows
      Merge pull request #890 from zaphod42/maint/3.0rc/pluginsync-tests-on-windows
      (#15202) Handle paths with files in them
      Merge commit '2.7.17' into 3.0rc
      Merge branch '3.0rc' of github.com:puppetlabs/puppet into 3.0rc
      Merge remote-tracking branch 'upstream/3.0rc' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge branch 'master' of github.com:puppetlabs/puppet
      Merge pull request #905 from pcarlisle/maint/3.0rc/modulepath-cache-before-initialized
      Merge pull request #921 from rtyler/issues/lc-all-15467
      Merge branch '2.7.x' into 3.0rc
      Merge branch '3.0rc' into 3.x
      Merge branch '3.x'
      Merge remote-tracking branch 'upstream/2.7.x' into 3.0rc
      Merge remote-tracking branch 'upstream/3.0rc' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Revert "Merge pull request #920 from rtyler/issues/gemfile-15464"
      Merge branch 'maint/master/conditional-pending' of https://github.com/joshcooper/puppet into 3.x
      (#15668) Use only one way of triggering pluginsync
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      (Maint) Fix assertion about locale
      Merge pull request #980 from hkenney/ticket/3.x/15514_distinguishing_which_solaris_support
      Merge branch '3.x'
      Merge pull request #977 from vrthra/ticket/3.x/15644_fix_parse_line
      Merge pull request #986 from mblair/master
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge pull request #994 from pcarlisle/ticket/3.x/15786-http-report-processor
      Merge remote-tracking branch 'upstream/3.x'
      (#15668) Replace test for order of files in pluginsync
      Merge pull request #983 from romke/ticket/2.7.x/15665_eix_update_run_every_time
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      (Maint) Simplify CONTRIBUTING.md
      Merge pull request #995 from zaphod42/maint/2.7.x/simplify_contributing_doc
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge pull request #892 from adrienthebo/bug/2.7.x/15264-fail_on_no_matching_title_patterns
      Merge branch '2.7.x' into 3.x
      Merge branch '3.x'
      Merge pull request #1006 from jeffmccune/bug/3.x/15337_dont_merge_puppet_conf
      Merge remote-tracking branch 'upstream/3.x'
      (#10915) Fix tests to work with new parameter checking
      (#10915) Add test for provider throwing NoMethodError
      Merge branch 'bug/2.7.x/10915-misleading-error-messages' into 2.7.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge pull request #1045 from pcarlisle/ticket/2.7.x/15912-functions
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      (#16042) Remove deprecated Functions methods
      Merge pull request #1051 from joshcooper/ticket/2.7.x/15693-windows-service
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge branch 'ticket/3.x/7788-rubygems' into 3.x
      (#7788) Cache paths from older rubygem versions
      (Maint) Remove dependency on Facter 2.0
      (Maint) Update version of puppet listed in gemspec
      Merge branch '15739_report_format_version' into 3.x
      Merge branch 'backport-15739_report_format_version' into 2.7.x
      (Maint) Remove trailing whitespace
      (#16137) Tilde expansion should only occur for normal users
      (Maint) Fix syntax and semantic erros in test
      Merge pull request #1110 from pcarlisle/ticket/3.x/15733-remove-mongrel
      Merge pull request #1074 from slindberg/ticket/3.x/7962_cert_expire_warning_redux
      (#7962) Skip certificate test on windows
      Merge branch 'ticket/3.x/7962-locked-file-on-windows' into 3.x
      (#15756) Call functions correctly in tests
      (#15756) Do not allow functions called without Array
      (#15756) Test behavior of function loading not mocks
      Merge pull request #1129 from hlindberg/15735-puppet-kick
      (#15756) Call include function correctly
      Merge branch 'ticket/3.x/16189-run_mode-not-working-for-faces' into 3.x
      Merge pull request #1145 from daniel-pittman/bug/3.x/16327-inventory-service-fails-when-target-is-absent
      Merge pull request #1144 from grimradical/tickets/3.0.x/15768
      Merge pull request #1156 from daniel-pittman/bug/2.7.x/4680-better-handling-of-csr-submission-problems
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      (Maint) Remove fragile test
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge pull request #1172 from pcarlisle/ticket/3.x/13435-sign-csrs-with-sha
      Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath_try3' into 3.x"
      (#16567) Remove :lexical setting default
      Merge branch 'ticket/3.x/16567-useless-setting-for-lexical-scope' into 3.x
      Merge pull request #1194 from jeffmccune/fix/3.0.x/16637_default_confdir_and_vardir
      (#15717) Require puppet/run in the agent
      (#15717) Allow pluginsync as an option to Puppet::Run
      (#16698) Do not set Node cache_terminus for storedconfigs
      (#16698) Add acceptance test for using store configs with an enc
      (#16922) Quote strings that contain ":"
      (#16922) Quote strings that contain ":"
      (#16698) Exclude enc+storeconfig test from solaris
      (Maint) Fix acceptance test to work on centos5
      (Maint) Exclude test from windows

Ashley Penney (4):
      The openbsd spec tests mistakenly used File.new instead of File.open.
      Fix this to use .read, not .open.
      (Maint) Add logging for when Puppet is enabled/disabled.
      (Maint) Add logging for when Puppet is enabled/disabled.

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

Branan Purvine-Riley (2):
      (maint) Confine pty-based test to non-Windows hosts.
      (maint) (acceptance) Strip fqdn before sending it to the sut

Brian Pitts (3):
      (13914) Fix ownership of log files
      Do not change ownership of log file if on Windows
      Handle chown failure

Brice Figureau (7):
      Refactor: configurer now returns report.exit_status
      Run the agent in a child process during catalog application
      (#15398) fix typo in Scope#number? float detection regex
      Performance: remove some occurences of type.to_s.downcase
      Performance: memoize resource#resource_type
      Performance: TypeCollection should remember nonexistent types before autoloading
      Performance: template wrapper calling info is slow

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

Cameron Thomas (5):
      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.

Carl Caum (2):
      Retry inventory ActiveRecord transaction failure
      Properly call indirector when storing file content

Carla Souza (1):
      Bug #7140 fix

Chris Price (78):
      (#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 #601 from cprice-puppet/master
      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
      cleanup whitespace, ala pull request #527
      Merge pull request #632 from cprice-puppet/cleanup/master/ssh_authorized_keys_whitespace
      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
      Fix console logging for no-daemonize mode
      (#13929) Improve logging for very early failures
      (#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
      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
      (#13559) added resource context to log messages when available
      Merge pull request #780 from pcarlisle/maint/master/use-externalfileerror
      Fix failing spec tests for module tool
      Fix some windows acceptance failures
      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
      (#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
      initial prototype for acceptance test libraries
      Refactor acceptance tests to use util library
      Merge pull request #734 from mkincaid/confines
      Merge pull request #812 from jeffmccune/maint/master/intialize_hiera_for_rspec_puppet
      Merge pull request #846 from haus/ticket/3.0rc/14843_add_block_to_self_execpipe
      (#15185) expand default user/conf dirs
      Fix run_mode test w/rt expanding tilde in user dir values
      Merge pull request #880 from cprice-puppet/bug/3.0rc/15185-default-user-dirs-not-expanded
      Merge pull request #885 from zaphod42/maint/3.0rc/pluginsync-acceptance-test-using-wrong-directory
      (#15975) Extract HTTP methods from REST Indirector
      (#15975) Add missing methods to new HTTP::Connection class
      (#15975) Proxy the request_get block to Net::HTTP
      (#15975) Add tests for http methods that accept blocks
      (#16139) Provide accessors for @puppet_version and @report_format in
      (#15214) Remove confdir and vardir from run_mode

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

Craig Dunn (1):
      added volcanes patch to allow calling_module and calling_class to be evaluated in scope

Curtis Ruck (1):
      (#16137) Ensure HOME is set before attempting ~ expansion

Dan Bode (1):
      (#13888) Fix self.instances for systemd service provider

Daniel Pittman (385):
      Merge pull request #23 from domcleal/tickets/master/5606
      Merge pull request #34 from nanliu/ticket/2.7.x/8814
      Merge pull request #61 from jblaine/patch-1
      Merge pull request #83 from jamtur01/tickets/master/8119
      Revert "Fixes #8119 - Write to a temporary file and move when storing reports."
      (#9508) Unify `auth no` and `auth any` in the system.
      Merge pull request #285 from jhelwig/disable-srv-lookup-by-default-in-tests
      Merge pull request #299 from mmrobins/ticket/master/maint-fix_augeas_spec_merge
      Merge pull request #222 from grimradical/tickets/master/7660_puppetqueue_init_script
      Merge branch '2.7.x' into feature/master/merge-2.7.x-branch
      (#11727) Support STDIN for `puppet parser validate`
      Merge pull request #298 from zsprackett/gitignore
      Merge branch '2.7.x'
      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 #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 #370 from fpletz/fix-9160
      Merge branch 'codec-ticket/10907-logoutput-on-failure'
      Merge pull request #375 from carlasouza/master
      Merge branch '2.7.x'
      Merge pull request #18 from nanliu/ticket/12037
      Merge pull request #410 from nicholashubbard/patch-1
      Merge pull request #408 from cprice-puppet/bug/master/11860-LANG-environment-var
      Merge remote-tracking branch 'origin/2.7.x'
      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 #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 #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 #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 #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
      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
      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 #465 from cprice-puppet/bug/master/12454-device_spec-ruby187-357
      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 #456 from cprice-puppet/refactor/master/12359-improve-backtrace-logging
      Merge pull request #462 from lurkermike/master
      Merge pull request #478 from cprice-puppet/bug/master/12490-execution_spec-sets-ENV
      Facter 1.5.7 compatibility in the test condition.
      Merge pull request #484 from binford2k/master
      Merge pull request #491 from cprice-puppet/bugs/master/fix_stderr_acceptance_tests
      Merge pull request #495 from cprice-puppet/cleanup/master/deprecated-util-execution-message
      Merge remote-tracking branch 'origin/2.7.x'
      Merge pull request #502 from cprice-puppet/bugs/master/fix_stderr_acceptance_tests
      Merge pull request #512 from cprice-puppet/feature/master/improve-backtrace-logging
      Merge pull request #508 from pmorch/doc-for-apply-noop
      Merge pull request #241 from GregSutcliffe/pacman_aur_support
      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
      Merge pull request #529 from joehillen/master
      Merge pull request #516 from pcarlisle/ticket/master/12126-autoloader-reload
      Merge remote-tracking branch 'origin/2.7.x'
      Merge pull request #533 from pcarlisle/ticket/master/12126-fix-test
      Merge pull request #547 from pcarlisle/ticket/master/12126-fix-ruby1.8.5-acceptance
      Merge pull request #544 from pcarlisle/ticket/master/12763-reloadable-plugins
      Merge pull request #567 from Erkan-Yilmaz/master
      Merge pull request #522 from domcleal/tickets/master/8011c
      Merge pull request #545 from pcarlisle/ticket/master/12891-reload-features
      Merge remote-tracking branch 'origin/2.7.x'
      Merge pull request #569 from pcarlisle/ticket/master/3910-server-authoritative
      Merge pull request #483 from daniel-pittman/maint/master/facter-1.5.7-compatibility-in-test
      Merge pull request #571 from puppetlabs/integration/master/7749-bootstrapping-puppet
      Merge pull request #590 from cprice-puppet/cleanup/master/trollop_pull_request
      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 #621 from puppetlabs/integration/master/13588-log-dir-perms
      Merge pull request #612 from zaphod42/refactor/remove-unused-fileserver
      Bring Nagios module back into the core.
      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
      Implement Array#drop for Ruby 1.8.5
      Merge 2.7.x into master.
      Merge pull request #687 from jeffweiss/maint/master/add_provider_confine_exists_nil_spec
      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
      Merge 'puppet-feature/master/3757-agent-lockfiles' from cprice
      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 2.7.x into master.
      Merge pull request #659 from bodepd/bug/master/13888_systemd_self_instances_fix
      Merge 2.7.x into master.
      Merge branch '2.7.x'
      Merge pull request #706 from pcarlisle/autoloader-windows
      Merge pull request #726 from pcarlisle/ticket/master/14229-path-setting
      Merge pull request #715 from ccaum/static_compiler_fix
      Merge pull request #718 from kelseyhightower/ticket/master/8235_plugin_system_for_tools_like_hiera
      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
      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
      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 #748 from pcarlisle/maint/master/rubygems-i-hate-you
      Merge pull request #750 from pcarlisle/maint/master/base-setting-refactor
      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
      Rewrite `have_printed` matcher to be more robust.
      Merge branch 'maint/master/fix-printing-version' by pcarlisle
      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.
      (#11727) Support STDIN for `puppet parser validate`
      Implement Symbol#intern when it is missing.
      Use `intern` rather than `symbolize` in Puppet::Type
      Eliminate `symbolize` everywhere, and remove it.
      zaml: statically determine the to_ascii8bit implementation.
      zaml: rework strings for correctness and speed
      zaml: add whitespace for readability.
      zaml: avoid calling emit when we don't have anything to output
      zaml: don't use backreferences on strings
      A node always has an environment.
      A scope always has a compiler.
      Drop the hash prefix when passing compiler to scope.
      Eliminate an unused library from the scope.
      Use `Forwardable` rather than hand-rolling it.
      Simplify the code handling the namespace option to the scope.
      Use `alias` to map []{,=} to {lookup,set}var on scope.
      Treat `nil` as false, not true in scope and AST evaluation.
      Simplify the number? implementation of scope.
      Simplify the scope `to_hash` implementation.
      Simplify the scope `emphemeral_include?` method.
      Check that function loading worked correctly.
      compiler: use forwardable where applicable.
      Use `set_options` rather than open-coding it everywhere.
      ast: trivial indentation and line wrap fixes.
      ast: eliminate dead `settor` attribute of AST nodes.
      ast: native boolean stringification is just fine.
      ast: correctly quote strings in {Flat,}String nodes.
      ast: code cleanup for HostName nodes.
      ast: code cleanup for variable nodes.
      ast: eliminate dead, commented-out code.
      collector: break over-long line.
      functions: trivial code shortening
      lexer: clearer variable name for the initializer
      lexer: use alias instead of hard-rolling it...
      lexer: be consistent about how to access a member
      lexer: use forwardable rather than hand-rolling it.
      lexer: raise errors before creating objects
      lexer: use methodhelper to set token options.
      lexer: whitespace and indentation clean token lists
      lexer: use generalized truth for `indefine?`
      lexer: more forwardable delegation
      parser: use forwardable rather than reimplementing it
      resource: use delegation and aliasing rather than wrappers
      resource: cleanup indentation and redundant code
      resource: eliminat 0.24 compatibility metaparameter support
      scope: simplify and clarify if statements
      scope: use methodhelper to handle compiler option setting
      scope: comment on a future cleanup
      type_loader: use forwardable rather than hand-rolling it
      Eliminate Puppet type attribute aliases.
      zaml: unify on a single definition of `to_zaml` for Symbol
      Avoid object creation/destruction when possible.
      type: memoize key_attributes for types.
      tagging: document why fixing this horror is hard.
      lexer: remove some unused stats collection
      monkey_patch: cache Symbol to_proc result.
      type: support implicit "identity" transformation
      FileCollection is a memory loss, not a memory win.
      Eliminate remaining uses of FileCollection.
      parser/files: use a cheaper test for "is this path absolute?"
      util: don't rebuild regexp every time we invoke absolute_file?
      zaml: don't sort object attributes for output
      provider: don't create useless proc instances.
      whit: cache the `to_s` result.
      Implement `Fixnum#ord` for Ruby 1.8.5
      zaml: speed micro-optimization for Time output
      log_paths: memoize the entire value, not just part of it.
      file_serving: avoid rewriting paths if possible.
      tagging: use a static regexp rather than rebuilding it
      zaml: handle multi-line map keys and array values correctly.
      Implement a JSON file terminus to mirror YAML.
      Add catalog JSON terminus to improve performance.
      Disable ActiveSupport::Dependencies hooks.
      Check that function loading worked correctly.
      Merge pull request #1081 from joshcooper/maint/2.7.x/rspec-color
      Merge pull request #1020 from gleb/ticket/2.7.x/15920_fix_sexp_ignore_comments_in_puppel_el
      Merge pull request #1076 from gsamokovarov/move-singleton-require
      maint: remove .rspec entirely
      Merge pull request #944 from nfagerlund/maint/2.7.x/node_clean_help
      Merge branch 'feature/3.x/16175-update-modification-time-on-filebucket-contents' into 3.x
      Make SELinux internal helper functions private.
      (#8714) Don't follow symlinks in SELinux FS detection
      Merge pull request #876 from zaphod42/feature/2.7.x/11727-stdin-parsing-in-face
      Merge pull request #1098 from ahpook/2.7.x
      Merge pull request #1073 from cprice-puppet/refactor/3.x/16139-inconsistent-access-to-report-data
      Merge pull request #1084 from pcarlisle/ticket/3.x/16058-pson-catalog-cache
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge pull request #1090 from joshcooper/ticket/2.7.x/16119-accept-cr
      Merge pull request #1091 from joshcooper/ticket/2.7.x/16019-platform-specific-paths
      Merge pull request #1092 from MosesMendoza/maint/2.7.x/shift_to_using_packaging_repo
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge pull request #1082 from joshcooper/ticket/2.7.x/15591-segfault
      Merge pull request #1085 from nfagerlund/maint/2.7.x/bad_escaping_in_doc_strings
      Merge pull request #1087 from pcarlisle/maint/2.7.x/test-warnings
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge pull request #1093 from MosesMendoza/maint/3.x/shift_to_using_packaging_repo
      Merge pull request #1095 from MosesMendoza/remove_version_check_from_puppet
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Revert "(#15852) Remove version check from puppet_spec.rb"
      Port the SemVer test from Test::Unit to RSpec.
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge pull request #973 from djmitche/detailed-param-failure
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Fix a test broken by the improved parameter error reporting.
      AST Scope variable names must be strings.
      Merge pull request #821 from daniel-pittman/bug/2.7.x/3984-better-handling-of-selinux-warnings
      Merge pull request #1078 from vrthra/tickets/3.x/16157_fix_zpool
      Merge pull request #1052 from stschulte/ticket/2.7.x/15959_group_systemparam
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge branch 'hiera-puppet-for-merge' into maint/3.x/merge-hiera-puppet-into-core
      Clean up the Hiera Puppet integration.
      Merge branch 'sciurus-13914' into 3.x
      Merge pull request #1106 from pcarlisle/ticket/3.x/13563-verify-crl
      Use Pathname.realpath instead of writing it...
      Merge pull request #1115 from pcarlisle/ticket/3.x/16275-catalog-environment
      Merge pull request #1118 from vrthra/ticket/3.x/13452_solaris_acceptance_tests
      Merge pull request #1079 from vrthra/ticket/3.x/16160_fix_zfs
      Merge pull request #1120 from MosesMendoza/maint/3.x/remove_apple_pkg_task
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge pull request #1072 from vrthra/ticket/3.x/15547_fix_mock
      RSpec 3 is deprecating `expect {}.should` - respect that.
      Merge branch 'maint/2.7.x/rspec-fix-deprecation-expect-should' into 2.7.x
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      RSpec 3 is deprecating `expect {}.should` - respect that.
      (#16027) Restore function context to backtraces
      Skip symbolic link demanding test on Windows
      Merge pull request #1105 from zaphod42/ticket/3.x/15756-disallow-incorrect-function-calls
      Update copyright years in LICENSE
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge pull request #1132 from zaphod42/ticket/3.x/15756-disallow-incorrect-function-calls
      Merge pull request #1141 from ahpook/16184_auth_conf
      Merge pull request #1138 from vrthra/ticket/3.x/16383_solaris_acceptance_tests_updates
      (#16330) Update ZAML to latest upstream.
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      (#16327) Fix fact terminus configuration cache handling
      (#16327) Continue agent run when node terminus find fails
      Git ignore an .rvmrc file in the root of the project
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      (#4680) Reject CA network operations when master CA is disabled
      Implement a JSON file terminus to mirror YAML.
      Add catalog JSON terminus to improve performance.
      Implement Symbol#intern when it is missing.
      Use `intern` rather than `symbolize` it Puppet::Type
      zaml: statically determine the to_ascii8bit implementation.
      zaml: unify on a single definition of `to_zaml` for Symbol
      Avoid object creation/destruction when possible.
      type: memoize key_attributes for types.
      tagging: document why fixing this horror is hard.
      lexer: remove some unused stats collection
      monkey_patch: cache Symbol to_proc result.
      type: support implicit "identity" transformation
      FileCollection is a memory loss, not a memory win.
      Eliminate remaining uses of FileCollection.
      parser/files: use a cheaper test for "is this path absolute?"
      util: don't rebuild regexp every time we invoke absolute_file?
      zaml: don't sort object attributes for output
      whit: cache the `to_s` result.
      zaml: speed micro-optimization for Time output
      log_paths: memoize the entire value, not just part of it.
      file_serving: avoid rewriting paths if possible.
      tagging: use a static regexp rather than rebuilding it
      Implement `Fixnum#ord` for Ruby 1.8.5
      Merge pull request #1164 from joshcooper/maint/3.x/order-dependent-failures
      (#15190) Avoid deprecated iconv on Ruby 1.9
      zaml: rework strings for correctness and speed
      zaml: add whitespace for readability.
      zaml: avoid calling emit when we don't have anything to output
      zaml: don't use backreferences on strings
      zaml: handle multi-line map keys and array values correctly.
      Disable ActiveSupport::Dependencies hooks.

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

Deepak Giridharagopal (6):
      Merge pull request #382 from masterzen/tickets/master/11044
      Merge pull request #24 from kbarber/ticket/master/14124_ruby19_broken_rake
      Merge pull request #11 from hunner/bug/master/rubygems_unnecessary
      (#15768) Deprecate ActiveRecord-based storeconfigs terminuses
      (#15678) Deprecate ActiveRecord-based inventory service terminuses
      (#15768) Deprecate puppet queue

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

Dominic  Maraglia (2):
      Merge pull request #359 from djm68/pending_test_ticket_11727
      Merge pull request #801 from kelseyhightower/maint/3.0rc/add_databinding_acceptance_tests

Dominic Cleal (9):
      (#8011) Support temp repo URLs in pkgutil provider
      (#8808) Fail Augeas resource when unable to save changes
      (#5606) Print Augeas' /augeas//error info to debug on save failure
      (#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
      (#8011) Support temp repo URLs in pkgutil provider
      (#14378) Skip context-based optimisation for complex expressions
      (#14136) Emit debug/warnings when Augeas provider fails to load files

Dominic Maraglia (6):
      Merge branch 'ticket/2.6.x/6418'
      Merge branch 'master' of github.com:puppetlabs/puppet
      (#10032) Update test to run on solaris
      (#11727) Fix support stdin test
      (#11727) Another fix to 11727
      (#11727)  Move test for 11727 to pending

Dustin J. Mitchell (4):
      Don't mask NoMethodErrors
      (#16208) Better error messages for failed parameter validation
      (#16208) use #{ref} instead of #{type} #{title} as suggested by dpittman
      (#16208) fix tests

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

Eric Sorenson (13):
      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
      (#15797) Change the argument to chkconfig from 'on' to 'reset'
      (#15966) Update packaging files for 3.0.0rc4
      (#15966) Update README.me for correct facter version dependency
      (#15966) Update gem.rake task for correct facter version dependency
      (#15739) Bump report_version since #10064 change its format
      (#15739) Bump report_version since #10064 change its format
      Merge pull request #1080 from zaphod42/ticket/3.x/16137-unable-to-start-puppet-as-a-service
      Revert "(#15797) Change the argument to chkconfig from 'on' to 'reset'"
      (#15797) Update chkconfig test to reflect reality
      (#16184) Improve example auth.conf

Eric Stonfer (1):
      (#15346) add --source to the gem list command

Erik Dalén (1):
      (#16175) Touch filebuckets contents when we get a new path

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 (2):
      Fail if a lookup key isn't passed
      Add test coverage for hiera_hash()

Genadi Samokovarov (1):
      Move singleton require to puppet/util/storage.rb

Gleb Arshinov (1):
      (#15920) Make forward-sexp ignore comments in puppet-mode.el

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

Hailee Kenney (31):
      (#3909) Strip trailing dot from default FQDN
      (#3909) Move default certname logic to Puppet::Settings
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      Merge branch 'tickets/3.0.x/15398' of https://github.com/masterzen/puppet into 3.x
      Merge remote-tracking branch 'origin/3.x'
      Merge branch 'fixpid' of https://github.com/vrthra/puppet into 3.x
      Merge branch 'non-string-resource-titles' of https://github.com/nicklewis/puppet into 3.x
      Revert "Merge branch 'non-string-resource-titles' of https://github.com/nicklewis/puppet into 3.x"
      Revert "Merge branch 'fixpid' of https://github.com/vrthra/puppet into 3.x"
      Merge branch 'runit' of https://github.com/vrthra/puppet into 3.x
      Merge pull request #974 from vrthra/3.x
      (#15514) Add compatibility with change to operatingsystem fact
      Merge branch 'ticket/3.x/11870-other-package-types' of https://github.com/joshcooper/puppet into 3.x
      (#11870) Add compatibility with recent Solaris changes
      Merge branch '3.x' of github.com:puppetlabs/puppet into 3.x
      (#15752) Remove ca_days
      (#15750) Remove setting `cacrl` to false
      (#15758) Remove fact downcasing
      (#15765) Don't allow setting recursion depth with `recurse`
      (#15766) Remove 'path' as a valid parameter for the mount point
      (#15760) Require $ on variables in definitions
      (#15765) Raise error for invalid values for recurse parameter
      (#15751) Remove `--apply` option
      (#15753) Remove `reportserver` setting
      (#15755) Remove `set_default_format` method
      (#15763) Remove `mkmodelmethods` method
      (#15762) Remove support for Facter versions below 1.5.5
      (#15769) Remove `type` attribute for package
      (#15771) Remove deprecations in Type objects
      (#15752) Remove references to ca_days
      (#15762) Clean up `reload_facter` method

Henrik Lindberg (4):
      (#15735) Deprecate puppet kick, and agent --listen.
      (#16189) Make --run_mode a global option and not a setting
      Fix issue with chown failing in test.
      (Maint) Add tests of passing undef as parameter.

Hunter Haugen (3):
      Adding hiera_hash() Puppet function
      Adding hiera_hash for CHANGES.txt
      Rubygems is not required to use hiera

Jacob Helwig (37):
      (#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
      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 branch 'ticket/10081' of git://github.com/jgrocho/puppet
      Revert "Merge branch 'ticket/10081' of git://github.com/jgrocho/puppet"
      (#3669) Find servers via DNS SRV records
      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 branch 'tickets/master/10032-fix-acceptance-path-issues-on-solaris'
      Merge remote-tracking branch 'nicklewis/fix-read_body-called-twice'
      Merge remote-tracking branch 'nicklewis/master'
      Merge branch 'add-pkgin-provider'
      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'

Jakub Holy (2):
      tidy.rb: Added info about the default value of 'type' to the doc.
      tidy.rb: Added info about the default value of 'type' to the doc.

James Turnbull (6):
      (#10064) Add the Puppet environment to reports
      Fixed #11888 - Changed providers to use osfamily fact.
      Fixed #10219 - uninitialized class variable Schedule type
      Fixed #14975 - Fixed incorrect help text in puppet doc application
      Fixed #14975 - Fixed incorrect help text in puppet doc application
      Fixed #11686 - Updated documentation for exec timeout

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

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

Jeff McCune (139):
      (minor) tweaks to modules README
      (#8032) Add containment to create_resources
      Merge pull request #15 from jeffmccune/ticket/master/8032_create_resources_containment
      Merge pull request #249 from lifton/master
      Merge branch 'bug/master/10837_retry_inventory_save_on_failure'
      Merge branch 'feature/master/merge-2.7.x-branch'
      Merge pull request #353 from daniel-pittman/bug/master/11727-allocate-pty-in-the-acceptance-test
      Merge pull request #570 from francois/master
      (maint) Make 3.0.x work with rspec-puppet
      Fix Puppet::Util.execute is deprecated warning
      Merge pull request #895 from jeffmccune/fix/3.0rc/diff_warning
      Fix spec test failures from diff warning
      Merge branch 'fix/3.0rc/diff_warning_specs' into 3.0rc
      (#15202) Make puppet module install create parent directories
      (maint) Add trailing newlines to all files
      (maint) Standardize on /usr/bin/env ruby -S rspec
      Merge pull request #903 from jeffmccune/maint/3.0rc/fix_spec_bang_lines
      (maint) Remove duplicate key in requestdir default
      Merge pull request #902 from zaphod42/bug/3.0rc/15202-puppet-should-create-module-directories
      (Maint) Add tags to .gitignore for ctags
      (Maint) Fix Could not find Puppet Face :foo
      Merge branch 'maint/3.0rc/do_not_show_symbols_to_users' into 3.0rc
      (#15307) Fix puppet help when a face throws an exception
      Merge branch 'jeffmccune-maint/3.0rc/15307_fix_puppet_help_with_exceptional_faces' into 3.0rc
      (maint) Whitespace only settings_spec.rb cleanup
      (#3120) Disambiguate the localcacert setting
      Merge pull request #916 from jeffmccune/ticket/3.0rc/3120_disambiguate_localcacert
      (#3120) Fixup default descriptions
      Merge branch 'fixup/3.0rc/defaults' into 3.0rc
      Merge pull request #924 from kbarber/ticket/3.0rc/15492-deprecate_puppet_util_execute
      Merge pull request #925 from kbarber/ticket/3.0rc/15493-missing_https_conversion_in_test
      Merge branch '3.0rc' into 3.x
      Merge branch '3.x'
      Merge pull request #945 from kbarber/ticket/3.x/maint-find_module_root_fix_expand_path_test_failure
      (maint) Add Puppet::Parser::Scope.new_for_test_harness
      Add watchr script
      (Maint) Use PuppetlabsSpec::PuppetSeams.parser_scope
      Merge branch 'fix/3.x/harness_the_scope' into 3.x
      Merge remote-tracking branch 'origin/3.x'
      Merge branch 'fix/1.x/harness_the_scope' into 1.x
      Merge branch '1.x'
      (Maint) Fix mock error with hiera module
      Merge branch '1.x'
      (Maint) Fix missing spec_helper lines in some tests
      Merge branch 'fix/1.x/fix_mock_failure' into 1.x
      Merge branch '1.x'
      (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
      Merge pull request #42 from jeffmccune/maint/1.x/align_with_spec_helper
      Merge branch '1.x'
      (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
      Merge branch 'maint/1.0rc/fix_spec_test_scope_issue' into 1.0rc
      Merge remote-tracking branch 'pcarlisle/ticket/3.x/7705-rest-auth-conf' into 3.x
      Merge branch '3.x'
      (Maint) Whitespace cleanup of CONTRIBUTING.md
      Add HOWTO hint on topic branches in CONTRIBUTING
      Make the example in CONTRIBUTING imperative and concrete
      Mark git diff --check as inline code
      Merge branch 'fix/2.7.x/my_contribution' into 2.7.x
      Merge branch '2.7.x'
      Merge branch '2.7.x' into 3.x
      Merge branch '3.x'
      (Maint) Add cprice to Git mailmap
      (Maint) Move Trollop inside of Puppet
      (Maint) Use $LOAD_PATH instead of $:
      (Maint) Clean up markdown in README_DEVELOPER
      (#15337) Do not merge user and system puppet.conf
      (#15940) Add test coverage for rdoc exclude option
      Merge branch 'ticket/2.7.x/15940_puppet_doc_should_exclude' into 2.7.x
      Merge branch '2.7.x' into 3.x
      Merge branch 'maint/2.7.x/log_agent_enable_disable' into 2.7.x
      (#15346) Add spec test for --source when checking latest
      Merge branch 'ticket/2.7.x/15346_add_gem_source_parameter' into 2.7.x
      Merge branch '2.7.x' into 3.x
      Merge pull request #1034 from vrthra/maint_fix_locale
      Merge branch 'kbarber-ticket/3.x/pmt_missing_stub_on_test_nonexistent_dir' into 3.x
      (Maint) Fix rspec options file
      (#15464) Make contributing easy via bundle Gemfile
      Move Puppet version into lib/puppet/version.rb
      (#15464) Make Puppet usable as a Gem from source
      (#15464) Make Puppet.version settable via Puppet.version=
      Merge branch 'ticket/2.7.x/15464_a_gemfile_would_improve_contributor_on-boarding' into 2.7.x
      Revert "Merge branch 'ticket/2.7.x/15464_a_gemfile_would_improve_contributor_on-boarding' into 2.7.x"
      Revert "Revert "Merge branch 'ticket/2.7.x/15464_a_gemfile_would_improve_contributor_on-boarding' into 2.7.x""
      (#15464) Exclude gem command from bundler
      Merge branch 'ticket/2.7.x/15464_gemfile_try_2' into 2.7.x
      Merge branch '2.7.x' into 3.x
      (Maint) Fix Puppet.version in 3.x
      Merge branch 'fix/3.x/fix_version_string' into 3.x
      Merge pull request #1061 from cprice-puppet/bug/3.x/http-request-get
      (Maint) Fix Puppet::Util.execute warning
      Merge branch 'fix/3.x/environment_acceptance_tests' into 3.x
      (#15797) Add test coverage for redhat service provider
      (Maint) Whitespace only cleanup
      (#15797) Disable RedHat services in all run levels
      Merge branch 'ticket/2.7.x/15797_redhat_chkconfig' into 2.7.x
      Merge branch '2.7.x' into 3.x
      Merge branch 'maint/3.x/15975_add_tests_for_request_methods' into 3.x
      Whitespace only cleanup
      (Maint) Stop watchr from reading non-existent spec.opts
      (#15193) Document how to use the static compiler
      Document the different forms of catalogs to help test writers
      (#15193) Add spec test coverage for static compiler
      (#15193) Fix StaticCompiler#store_content
      Merge branch 'bug/2.7.x/15193_fix_static_compiler' into 2.7.x
      Merge branch '2.7.x' into 3.x
      (#15193) Fix windows failing on unix style paths
      Merge branch 'fix/2.7.x/15193_fix_windows_spec_failures' into 2.7.x
      Merge branch '2.7.x' into 3.x
      (#2888) Add settings catalog info to README_DEVELOPER
      (#2888) Fix race condition with puppetdlockfile
      Merge branch 'bug/2.7.x/2888_fix_puppetdlock_deadlock' into 2.7.x
      Merge branch '2.7.x' into 3.x
      (#3757) Rename agent_pidfile to agent_catalog_run_lockfile
      (Maint) Improve error message when catalog run is in progress
      Merge branch 'bug/3.x/3757_rename_agent_pidfile_to_agent_catalog_run_lockfile' into 3.x
      (Maint) Make puppet module install --confdir=foo puppetlabs-stdlib work
      (Maint) Add test coverage for --confdir=/tmp/puppet patch
      Merge branch 'undef-parameter-tests' into 3.x
      (#7316) Load applications from the modulepath
      Merge branch 'fix/3.x/7316_load_faces_from_modulepath' into 3.x
      (Maint) Fix spec failures with Puppet::Face[]
      Merge branch 'fix/3.x/fix_puppet_face_failures' into 3.x
      Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath' into 3.x"
      Revert "Merge branch 'fix/3.x/fix_puppet_face_failures' into 3.x"
      Merge branch 'revert/3.x/faces_from_modulepath' into 3.x
      Revert "Merge branch 'revert/3.x/faces_from_modulepath' into 3.x"
      (maint) Fix Failed to load face errors
      Merge branch 'fix/3.x/7316_load_faces_from_modulepath_try3' into 3.x
      (Maint) Remove rspec from shebang line
      Merge pull request #1188 from jeffmccune/maint/3.x/kill_rspec_shebangs
      Merge branch 'fix/3.0.x/16643_sample_module_rename' into 3.0.x
      (maint) Add .yardopts file
      (maint) Add yard generated documentation to git ignore
      (#16637) Add spec test for non-root puppet master confdir and vardir
      (#16637) Fix default confdir and vardir with puppet master as normal user
      (Maint) Update config.ru to fix issue with vardir
      Merge branch 'maint/3.0.x/config_ru_vardir' into 3.0.x
      (#16769) Fix header too long error with ExportCertData
      Merge branch 'fix/3.0.x/16769_export_cert_data_too_long' into 3.0.x

Jeff Weiss (43):
      (#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
      (#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
      (#13296) allow any keyword as resource param name
      (#13435) Change default signing digest algorithm
      (#12396) DRY up self.timeout
      Merge remote-tracking branch 'seanmil/schedule/feature/13054_rangespan-rebase'
      (documentation) Change README.md to use backtick
      Merge remote-tracking branch 'cprice-puppet/bug/master/fix-console-logging-for-no-daemonize'
      Merge remote-tracking branch 'seanmil/schedule/bug/7639-abbreviated_ranges'
      Merge remote-tracking branch 'cprice-puppet/bug/master/13929-exit-on-fail-logging'
      (#13898) Fail Face when option collides w/ setting
      (#13898) Fail Face when option collides w/ setting
      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'
      (maint) Make Puppet have hard dependency on Facter 2.0
      (maint) Change Facter dep from exit to raise
      Merge remote-tracking branch 'cprice-puppet/bug/master/14440-rake-manpages'
      Merge pull request #799 from zaphod42/maint/master/enable-test-for-node-and-enc-on-windows
      (maint) Update README.md w/ min Facter ver
      Merge remote-tracking branch 'zaphod42/maint/3.0rc/cleanup-crl-start-time' into 3.0rc
      (#15731) Full certificate metadata for pson
      (#15731) explicit fingerprint digest for pson
      (#14515) Tests fail with mocha 0.11.4
      (#15731) Move explicit fingerprints to hash
      (#15731) Add clarifying comments to host.rb
      Merge pull request #1182 from haus/maint/3.x/fixup_install_rb

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 (189):
      (#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'
      maint: Fix build break due to recent merge from 2.7.x to master
      Merge branch 'ticket/master/3669-make-puppet-honor-DNS-SRV-records'
      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 'pcarlisle/ticket/master/11552-remove-transobject-and-bucket'
      Merge remote-tracking branch 'matt/ticket/master/11595-delete_storeconfigs_activerecord_find'
      Merge remote-tracking branch 'pcarlisle/ticket/master/8296-xmlrpc_deletion'
      Merge branch 'ticket/master/11552-fix_puppetral_resource_parameters'
      Merge branch '2.7.x'
      Merge branch '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'
      Merge branch 'final_fix_11727_support_stdin_parsing_in_puppet_parser_validate'
      Merge branch 'bug/master/11860-LANG-environment-var'
      Maint: Fix parenthesize warning message
      Merge branch 'bug/master/12490-execution_spec-sets-ENV' of https://github.com/cprice-puppet/puppet
      (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'
      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'
      (#14441) Require instrumentation indirections
      Maint: Actually execute the tests on non-windows platforms
      Merge remote-tracking branch 'origin/1.0rc' into 1.x
      Merge remote-tracking branch 'origin/1.x'
      Merge branch 'maint/2.7.x/openrc-spec' of github.com:joshcooper/puppet into 2.7.x
      Merge branch '2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge pull request #949 from daniel-pittman/bug/3.x/fix-missing-ord-on-185
      (Maint): Re-enable tests on Windows
      (#11870) Add registry module
      (#11870) Refactor windows-specific requires
      (#11870) Add package options parameter
      Merge remote-tracking branch 'rahul/ticket/3.x/15803_zpool_instances' into 3.x
      (#15803) Split string for ruby 1.9
      Merge branch 'maint/3.x/15803_break' into 3.x
      Merge remote-tracking branch 'rahul/ticket/3.x/10978_smf_instances' into 3.x
      Merge remote-tracking branch 'upstream/2.7rc' into 2.7.x
      (#15471) Specify platform appropriate confdir
      Merge branch 'maint/3.x/settings-windows' into 3.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge remote-tracking branch 'upstream/3.x'
      Merge remote-tracking branch 'rahul/ticket/3.x/15804_solaris_zfs_instances' into 3.x
      Merge remote-tracking branch 'rahul/ticket/3.x/15547_valid_lang_sentinels' into 3.x
      Merge remote-tracking branch 'rahul/ticket/3.x/15569_fix_augeas_print_errors' into 3.x
      (#11870) Refactor the MSI provider to use package options
      (#11870) Add the ability to specify uninstall_options
      (#11870) Deprecate the `:msi` provider
      (#11870) Refactor package management logic for MSI
      (#11870) Manage executable packages on Windows
      (#9416) Confine based on the presence of a `zfs` command
      (#9416) Confine based on the presence of a `zpool` command
      (#9416) Refactor zfs spec tests
      (#9416) Refactor zpool spec tests
      Merge pull request #1011 from joshcooper/ticket/3.x/9416-zfs-zpool
      (#15686) Test for package provider features
      (Maint) Simplify spec test
      Merge branch 'ticket/3.x/15686_s10_resource_failure' into 3.x
      (#15686) Fix `odd number of arguments for Hash`
      Merge branch 'ticket/3.x/13938-zfs-dedup' into 3.x
      Merge remote-tracking branch 'apenney/openbsd' into 3.x
      Merge branch 'ticket/3.x/8288-pkgadd-local' into 3.x
      (Maint) Removed unnecessary stubbing
      Merge branch 'ticket/3.x/8200_validate_param' into 3.x
      Merge branch 'ticket/3.x/7175-symbolize' into 3.x
      Merge branch 'ticket/3.x/15644_fix_parse_line' into 3.x
      (maint) Include backtrace in re-raised exception
      (maint) Whitespace cleanup
      (maint) Remove spurious `puts` line
      Merge branch 'ticket/2.7.x/7442_solaris_password_max_age' into 2.7.x
      Merge branch 'ticket/2.7.x/15521-use_dynamic_forge_locale_for_acceptance' of git://github.com/kbarber/puppet into 2.7.x
      (maint) Consolidate flat file tests
      (maint) Refactor filetype specs
      (#14283) Raise an error when crontab returns non-zero on AIX
      (#14283) Call Tempfile#close and #unlink separately
      Merge branch 'ticket/master/authconf-ip-deprecation-warning' of https://github.com/pcarlisle/puppet into 3.x
      (#11870) Pass a list of Arrays to multiple_yields
      Merge branch 'maint/3.x/ruby193p0' into 3.x
      (Maint) Include the registry key path in the exception
      Merge branch 'maint/3.x/include_key_path' into 3.x
      (#11870) Ignore uninstall keys that don't exist
      Merge branch 'ticket/3.x/11870-skip-absent-keys' into 3.x
      (Maint) Skip crontab filetype tests on Windows
      (#15693) Allow restart command to be specified
      Merge branch 'ticket/3.x/15547_correct_pending' into 3.x
      Merge branch 'ticket/3.x/8200_validate_param' into 3.x
      Merge branch 'ticket/3.x/11004_pkg_provider' of git://github.com/vrthra/puppet into 3.x
      Merge pull request #1068 from zaphod42/maint/3.x/puppet-3-can-use-facter-1.6
      Merge pull request #1070 from vrthra/ticket/3.x/6143_fix_zpool
      (Maint) Enable colorized rspec output on Windows
      (#16137) Delay evaluation of config and var directories
      Maint: Make paths absolute on Windows
      Maint: Use pending block
      Merge branch 'ticket/3.x/16137-windows-build' into 3.x
      (#15591) Skip test that causes segfault on Windows
      (#15560) Refactor LogonUser
      (#15560) Create the user's profile if managehome is true
      (#15560) Delete user's profile after deleting account
      (#16119) Recognize carriage return escape sequence
      (#16019) Don't add Unix paths to Windows search path
      Maint: Fix leaked tempfile handle
      Maint: Fix inconsistent expect-should usage
      (#16208): Correct spec test to match new failed parameter message
      Merge branch 'maint/2.7.x/leaked-tempfile' into 2.7.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge branch 'maint/3.x/16027-backtrace' into 3.x
      Maint: Fix mismatched expect-should
      (#12630) Run puppet agent as a service
      (#13027) Guard against invalid runinterval values
      Merge branch 'maint/3.x/add_windows_daemon_service_to_ext' of github.com:haus/puppet into 3.x
      (#16347) Replace \x92 character with apostrophe
      (#16347) Qualify references to windows-pr gem
      Merge branch 'ticket/2.7.x/16347-gem-install' into 2.7.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Maint: Clear global state between tests
      Maint: Clear memory instances
      Maint: Clear parsedfile target and default_target
      Maint: Don't overwrite outer sum variable
      Maint: Ensure manages_password_age feature is set
      Merge branch 'feature/3.x/15190-avoid-iconv-on-ruby-193' of https://github.com/daniel-pittman/puppet into 3.x
      Merge branch 'feature/2.7.x/json-terminus-backport' of https://github.com/daniel-pittman/puppet into 2.7.x
      Merge branch 'perf/2.7.x/use-intern-not-symbolize' of https://github.com/daniel-pittman/puppet into 2.7.x
      Maint: Fix intermittently failing spec test
      Merge branch 'perf/2.7.x/backport-activesupport-hook-disabling' of https://github.com/daniel-pittman/puppet into 2.7.x
      Merge branch 'perf/2.7.x/backport-zaml-symbol-output-unification' of https://github.com/daniel-pittman/puppet into 2.7.x
      Merge branch 'perf/2.7.x/backport-zaml-performance-improvements' of https://github.com/daniel-pittman/puppet into 2.7.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      Merge branch 'perf/2.7.x/backport-reduce-memory-footprint' of https://github.com/daniel-pittman/puppet into 2.7.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.x
      (#15717) Acceptance tests for puppet kick
      Merge branch 'ticket/3.0.x/15717-puppet-kick' into 3.0.x
      Merge branch 'ldapnodes_setting' into 3.0.x
      (#15717) Kick agent using its fqdn
      (#16757) Move rubygems require to application entry point
      (#16757) Deprecate Puppet.features.rubygems?
      (#16757) Don't require rubygems
      (#16757) Prevent using rubygems when bundler is in use
      Merge branch 'ticket/3.x/16757-rubygems' into 3.0.x
      (#16801) Remove mongrel references from manpage
      (#16801) Remove mongrel references
      Merge branch 'ticket/3.0.x/16801_remove_mongrel_from_init_scripts' into 3.0.x
      Merge branch 'maint/3.0.x/update_suse_init_and_defaults' into 3.0.x
      Merge branch 'ticket/3.0.x/16698-enc-does-not-work-with-store-configs' of git://github.com/zaphod42/puppet into 3.0.x
      Merge branch 'ticket/3.0.x/16922-colon-on-fact-names-causes-problem' of git://github.com/zaphod42/puppet into 3.0.x
      Merge branch 'backport-colon' into 2.7.x
      Merge remote-tracking branch 'upstream/2.7.x' into 3.0.x
      (#17000) Use --no-client argument to prevent agent from starting
      Merge branch 'ticket/3.0.x/17000-puppet-kick-acceptance' into 3.0.x

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

Justin Stoller (2):
      Make Puppet's gem package task the same name as other Puppetlabs' projects
      Merge pull request #886 from zaphod42/maint/3.0rc/flickering-file-integration-test

Kelsey Hightower (39):
      (#11115) Support spec tests under rspec 2.7.x
      (#8701) waitforcert param configurable for puppet agent
      (#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
      (#14461) Remove Puppet parser functions
      Merge branch '2.7.x'
      Revert "Merge branch '2.7.x'"
      (maint) Manually resolve broken merge of 2.7.x
      (maint) Add data binding Hiera tests
      Revert "(#14461) Remove Puppet parser functions"
      Merge pull request #28 from haus/add_mac_packaging
      (#14514) Check for the presence of hiera config
      Merge pull request #29 from haus/add_deb_rpm_packaging
      Merge pull request #31 from pcarlisle/14841-array-hash-error
      Merge pull request #32 from pcarlisle/ticket/master/12122-multiple-backends
      (#14900) Add data bindings hiera-puppet support.
      (maint) Follow Puppet Labs style guide + code cleanup
      (maint) parser functions do not require hiera.yaml
      (maint) Add acceptance tests
      Merge pull request #35 from zaphod42/master
      (#15184) Refactor parser functions
      (maint) Hiera Puppet now has a LICENSE file
      (#15105) Update README YAML examples
      Merge pull request #901 from kbarber/ticket/3.0rc/15320-bad_gitignore_for_pmt_generate
      Merge pull request #891 from kbarber/ticket/3.0rc/14598-interact_with_the_forge_using_ssl
      Merge pull request #909 from kbarber/maint/3.0rc/missed_https_conversion_in_tests
      Merge pull request #920 from rtyler/issues/gemfile-15464
      Merge pull request #933 from stahnma/update_readme
      Merge pull request #936 from kbarber/ticket/3.0rc/15533-module_build_cwd
      Merge pull request #919 from rtyler/issues/gempackagetask-15463
      Merge pull request #938 from kbarber/ticket/3.0rc/15549-tests_for_find_module_root
      Merge pull request #859 from joshcooper/maint/master/conditional-pending
      Merge pull request #852 from jamtur01/ticket/master/14975
      Merge pull request #883 from jakubholynet/master
      Merge pull request #40 from haus/replace_should_with_to/remove_puppetlabs_spec_helper_require
      Merge pull request #41 from haus/update_hiera_puppet_packaging
      (#7788) Extend Puppet using rubygems

Ken Barber (17):
      (#14124) Load rake tasks directly to fix tests for Ruby 1.9.x
      Merge pull request #37 from kelseyhightower/maint/1.0rc/hiera_puppet_does_not_have_license_file
      Merge pull request #36 from kelseyhightower/bug/1.0rc/15184_cannot_locate_the_hiera_config_file
      (#14598) Add SSL support for forge interaction
      (#15202) Fix acceptance tests for creating non-existance directories
      (#15320) pmt generate generated _gitignore instead of .gitignore
      Fix tests response for nonexistent_directory tests
      (#15492) Deprecate the usage of Puppet::Util.execute in module face
      (#15493) Fix test to expect https not http
      (#15533) Change puppet module build to build the module in cwd (or parents)
      (#15549) Missing coverage for Puppet::ModuleTool.find_module_root and is_module_root?
      Fix find_module_root tests so paths are expanded in assertions
      (#15676) Fix puppet module face SSL acceptance tests to use masters real hostname
      (#15666) Include downstream error when raising CommunicationsError exception
      (#15521) Convert to using host stub wrapper
      Fix missing forge stub and directory check due to test change in 3.x branch rollup
      Merge pull request #1083 from daniel-pittman/maint/2.7.x/no-dot-rspec

Ken Dreyer (2):
      (#7442) solaris: add tests for password_max_age attribute
      (#7442) solaris: return "-1" for password_max_age when password aging is disabled

Lauri Tirkkonen (3):
      (#8465) Support SSL in HTTP report via HttpPool
      (#8465) Fix args to http_instance in spec
      (#8465) Test for SSL if using https reporturl

Lee Lowder (1):
      (#15940) Update puppet doc to ignore files and templates in modules

Luke Kanies (20):
      (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'

Marc Fournier (3):
      (#9416) Rename zfs provider from solaris to zfs
      (#9416) Rename zpool provider from solaris to zpool
      (#13938) Add dedup parameter to zfs provider

Markus Roberts (1):
      Fix for #3984 -- SELinux warns about changes it doesn't actually make

Matt Blair (1):
      one half the contributions

Matt Robinson (10):
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      maint: Fix order dependent spec failure
      Merge branch '2.7.x'
      (#11552) Remove TransObject and TransBucket
      (#11595) Delete unused activerecord catalog find
      (#8296) Remove XMLRPC code
      Merge branch '2.7.x'
      Fix augeas_spec branch merging mistake
      (#11552) Fix `puppet resource` ability to display parameters

Matthaus Litteken (66):
      Merge branch '2.7rc'
      Merge branch '2.7rc'
      Merge branch '2.7rc'
      Merge pull request #26 from kelseyhightower/ticket/master/14461_remove_puppet_parser_functions
      Updating CHANGELOG, conf/redhat/puppet.spec, conf/redhat/rundir-perms.patch, and man pages for 3.0.0rc1 release.
      Merge pull request #27 from kelseyhightower/ticket/master/14461_remove_puppet_parser_functions
      Add mac packaging to hiera-puppet
      Move conf to ext directory
      Add debian packaging for hiera-puppet
      Add Redhat packaging to hiera-puppet
      Merge pull request #807 from cprice-puppet/bug/master/14609-cant-run-under-passenger
      Add package task to tasks
      Updating CHANGELOG for hiera-puppet 1.0.0rc1
      Tweak debian packaging
      Updating CHANGELOG, conf/redhat/puppet.spec for Puppet 3.0.0rc2
      Update redhat init scripts to use `puppet (agent|queue|master)`
      Update puppet gem dependencies
      Update redhat.spec dependency to include hiera-puppet
      Merge pull request #822 from zaphod42/maint/3.0rc/fix-upstart-to-work-on-ruby-193
      Updating CHANGELOG, conf/redhat/puppet.spec for 3.0.0rc3
      (#14843, #14844) Add block to Puppet::Provider.execpipe
      Merge pull request #33 from kelseyhightower/1.0rc
      Merge pull request #853 from justinstoller/maint/2.7.x/normalize_gem_task_name
      Remove puppetlabs_spec_helper require from root Rakefile
      (maint) Replace .should on blocks with .to
      Update hiera-puppet package tasks
      Update debian package task to handle orig version properly and use the correct directory name when building.
      Update hiera-puppet hiera dependency to ~> 1.0
      Update CHANGELOG for 1.0.0rc2
      Merge branch '1.x'
      Merge pull request #43 from Whopper92/hiera_puppet_rake_package
      Merge branch '1.0rc' into 1.x
      (#15291) Add Vendor tag to Hiera-Puppet spec file
      Add hiera_puppet.rb to debian, redhat packages, fix gem version dependency
      (#15853) Update gem dependencies to reflect rc ordering
      Merge branch '1.0rc' into 1.x
      Merge branch '1.x'
      Updating CHANGELOG for 1.0.0rc3
      Merge branch '1.0rc' into 1.x
      Merge branch '1.x'
      (#15852) Allow rc in Puppet and Facter version strings
      (#15852) Remove version check from puppet_spec.rb
      Merge pull request #1069 from ahpook/15966_facter_version
      Updating CHANGELOG, PUPPETVERSION for 3.0.0-rc4
      Updating CHANGELOG for 1.0.0, changing hiera dependency to ~> 1.0
      Merge branch '1.0rc' into 1.x
      Merge branch '1.x'
      Merge pull request #1108 from vrthra/packaging/ips_repo
      Moving windows service into the ext directory.
      Merge pull request #1128 from MosesMendoza/pull_non_applicable_artifacts
      (#16376) Fix rails compatibility layer for activerecord < 3.0
      Merge pull request #1135 from MosesMendoza/maint/2.7.x/fix_apple_pkg_info_plist
      Update packaging to account for hiera-puppet merge
      (#16144) Update puppet spec file for fedora 17 and systemd changes
      Update puppet.spec.erb to correct rpmlint issues
      Merge pull request #1171 from MosesMendoza/maint/2.7.x/cleanup_package_repo_rake_tasks
      Update puppet.spec, bump required ruby to 1.8.7
      Remove sbin references from install.rb
      Replace Config::CONFIG with RbConfig::CONFIG
      Add --ruby flag to install.rb
      Update debian ruby dependencies to include 1.9
      Remove svn specific code from install.rb
      Removing hiera-puppet dependency from project_defaults
      Updating lib/puppet/version.rb for 3.0.0-rc7
      Update default cows and mocks
      Updating PUPPETVERSION for 3.0.0-rc8

Matthaus Owens (10):
      Merge pull request #1181 from MosesMendoza/maint/3.x/fixup_packaging_from_changelog_removal
      (#16801) Remove mongrel references from init scripts
      Maint: Retab puppetmaster init scripts
      Maint: Remove unused $prog variable from redhat puppetmaster init script
      Update redhat logrotate to signal correct process
      Remove unused suse packaging files
      (#16801) Update suse server.init and remove mongrel refs
      Update suse client.init for new pidfile, process name
      Update suse puppet.spec for Telly
      Update PUPPETVERSION for 3.0.1-rc1

Matthias Pigulla (4):
      (#9357) Delegate to install when upgrading MacPorts packages
      (#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 (2):
      Merge branch '2.7.x'
      Merge branch 'ticket/2.7.x/15731_full_certificate_metadata_for_pson' into 2.7.x

Michael Kincaid (3):
      Configure rcov and flay tests for metric_fu.
      Put the output in the user's TMPDIR, rather than the source tree.
      Change one test to use the new confine syntax.

Michael Stahnke (9):
      Ready repository for release process
      Merge pull request #350 from djm68/fix_11727_support_stdin_parsing_in_puppet_parser_validate
      Update main readme to have links to contrib and dev docs
      Update main readme to have links to contrib and dev docs
      Merge pull request #1166 from haus/ticket/3.x/16144_add_systemd_to_puppet
      Merge pull request #1173 from haus/maint/3.x/add_19_deps_to_debian
      Merge pull request #1176 from MosesMendoza/maint/3.x/remove_CHANGELOG_file
      Merge pull request #1174 from haus/maint/3.x/bump_required_ruby_to_187
      Merge pull request #1136 from haus/ticket/2.7.x/16376_update_rails_compatibility_layer

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

Moses Mendoza (28):
      Merge branch '2.7rc' into 2.7.x
      Merge branch '2.7rc' into 2.7.x
      Merge branch '2.7rc' into 2.7.x
      Update CHANGELOG, version.rb, redhat.spec for 3.0.0rc5
      Add yaml files
      Switch off building gem for 2.7.x
      Move redhat spec file to erb template in ext/redhat
      Add debian packaging artifacts and template
      Move and template all apple pkging artifacts to ext/osx
      Fixup Rakefile to use packaging repo
      Add in manpage listings that should have been there
      Remove broken dual build-requires of facter in redhat spec
      Remove version check regex from puppet
      Fix yum repo path in yaml file
      Fixup debian artifacts for 3.x
      Fixup for different source paths
      remove old tasks and pull out of rake subdir
      Move all packaging artifacts from conf to ext
      Remove debian manpages that are obsolete in 3.x
      Remove old apple package rake task
      Update lib/puppet/version.rb for 3.0.0-rc6
      remove non-applicable artifacts in packaging
      Fixup apple package plist for use with packaging repo
      fail better in package repo rake tasks
      Remove CHANGELOG file
      Remove references to CHANGELOG in packaging
      Update lib/puppet/version.rb for 3.0.0
      Update PUPPETVERSION for 3.0.1

MosesMendoza (9):
      Merge pull request #45 from haus/ticket/1.0rc/15291_add_vendor_tag_to_spec
      Merge pull request #46 from haus/ticket/1.0rc/15570_add_hiera_puppet_rb_to_packages
      Merge pull request #1029 from haus/ticket/3.x/15853_add_rc_to_gem_dependencies
      Merge pull request #1036 from haus/ticket/3.x/15852_allow_rc_version_strings
      Merge pull request #1044 from haus/ticket/3.x/15852_allow_rc_version_strings
      Merge pull request #1134 from haus/maint/3.x/update_packaging_for_hiera_puppet_merge
      Merge pull request #1170 from haus/maint/3.x/fixup_lint
      Merge pull request #1180 from haus/maint/3.x/update_install_rb_for_3x
      Merge pull request #1185 from haus/maint/3.x/update_default_cows_and_mocks

Nan Liu (3):
      (#8814) Update fqdn_rand for ruby 1.9.2 rand bug.
      (#12037) hiera-puppet should support hash values.
      Merge pull request #17 from glarizza/feature/master/raise_parse_error

Nicholas Hubbard (1):
      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 (40):
      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
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Merge remote-tracking branch 'josh/maint/master/resource_and_suidmanager_specs'
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Don't try to read the body of a file content response twice
      Fix failing acceptance test in resource/file/source_attribute.rb
      Merge branch '2.7.x'
      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
      Fix incorrect command execution in acceptance test

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

Niels Abspoel (3):
      systemd unit files added on own branch for pull request to satisfy issue 16144 : https://projects.puppetlabs.com/issues/16144
      This will fix Refactor #16643.
      sample_module.pp refactored text: include sample-module into include sample_module

Patrick (1):
      (#8296) Remove logic around XMLRPC vs REST protocols

Patrick Carlisle (214):
      Merge branch '9357-macports-install'
      Merge branch 'tickets/master/10064'
      (#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 'tickets/master/10950'
      (#12060) Remove factsync
      (#11858) Don't load plugins during sync.
      Revert "(#11858) Don't load plugins during sync."
      (#12127) Implement local pluginsync from modulepath for puppet apply
      (#12127) Add acceptance test for pluginsync on puppet apply
      (#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
      Clear deprecation warnings after each test.
      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
      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
      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'
      Merge branch '2.7.x'
      Fix loading of faces in specs
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Merge branch '2.7.x'
      Merge 2.7.x merge branch into master
      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
      Update use of reparse to reparse_config_files
      Merge branch '2.7.x'
      (#13341) Add wrapped exceptions
      (#13341) Log nested exceptions
      Merge branch '2.7.x'
      (#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
      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 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
      (#12122) Use nil as default answer in lookup
      (#14841) Give useful error for array or hash lookup failure
      (#14841) Add test for hiera_hash parser function
      (#14841) Add test coverage for remaining hiera parser functions
      (#14789) Fix inconsistent normalization and API in autoloader
      (#14927) Set node environment correctly in termini
      When changing environment make sure to state what the new environment is
      (#15024) Improve error logging in fileserver conf
      Use in memory sqlite database for unit tests
      Stub pkginfo when installing in openbsd spec
      Stub sleep in runit provider test
      Fix assignment in argument in metatype
      Store into $LOADED_FEATURES with .rb extension
      Cleanup unnecessary code in environment
      Refactor module to require path and environment args
      Merge branch 'environment-performance' into 3.0rc
      Only cache module_directories once settings are initialized
      Merge commit 'ecc52ed' into 3.0rc
      Merge branch '2.7.x' into 3.0rc
      Merge branch '3.0rc' into 3.x
      Merge branch '3.x'
      Escape unicode in ca specs
      Fix webrick spec to work on Windows
      Merge branch '3.0rc' into 3.x
      Merge branch '3.x'
      Preserve ordering when returning module list
      Merge branch '3.0rc' into 3.x
      Merge branch '3.x'
      Refactor ast_spec to use real values
      Pull out initialization of resource class? and stage?
      Merge branch 'performance-3.x-brice' into 3.x
      Merge branch 'perf/3.x/reduce-puppet-memory-footprint' into 3.x
      Merge remote-tracking branch 'dpittman/perf/3.x/only-one-symbol-to-zaml' into 3.x
      Merge remote-tracking branch 'dpittman/perf/3.x/eliminate-type-attribute-aliases' into 3.x
      Reduce stubs and expectations on settings
      Fix specs for windows
      Use Puppet::Util to check absolute path in ca
      Fix paths for pidlock tests for windows
      Remove 'pending' status for getting SSL::Host
      Use rspec 2.11 compatible block syntax
      Merge branch '2.7.x' into 3.x
      Merge branch '3.x'
      Merge branch '2.7.x' into 3.x
      wip
      Make 3.x specs compatible with rspec 2.11
      Merge remote-tracking branch 'origin/3.x' into 3.x
      Merge remote-tracking branch 'origin/2.7.x' into 3.x
      (#15668) Don't pluginsync for apply
      Remove Network::Authorization code which was only used for XMLRPC
      Remove deprecated method of accessing files in modules
      Remove code for XMLRPC namespaces
      Merge RestAuthConfig into AuthConfig
      Rename {rest_,}authorization.rb
      Add allow_ip and deny_ip keywords to auth.conf
      Rename rest_authconfig_spec to authconfig_spec
      Merge the old RestAuthConfig specs into the specs for AuthConfig
      Refactor AuthConfig parsing into AuthConfigParser
      Remove proxy methods going from Rights to Right
      Only load auth.conf once
      (#15786) Allow plain http connections for report processors
      Merge pull request #968 into 3.x
      Don't issue deprecation warnings for allow_ip
      Fix stubbing on nil in some specs
      Don't require mocha in spec_helper
      Rename specs to end in _spec.rb
      Avoid stubbing Thread::new due to issues in newer mocha
      Clear Environment.current when calling Environment.clear
      Add Puppet::Parser::Functions::clear for specs
      Merge branch '2.7.x' into 3.x
      Merge branch '3.x'
      Convert expect..should to expect..to in configurer spec
      Use TestHelper in old unit tests
      Always set log functions on root environment
      Merge branch '2.7.x' into 3.x
      Test that facts preserve case
      Add rake task to regenerate parser
      Merge branch 'maint/3.x/remove_deprecations' into 3.x
      (#15912) Make function access consistent
      Merge branch 'refactor/3.x/extract-http' into 3.x
      (#7788) Rely on Rubygems caching of directories
      (#16058) Add setting to configure catalog cache
      (#16058) Set pson as default catalog cache format
      Add a terminus setting type
      (#16058) Add setting to configure catalog cache
      (#16058) Set pson as default catalog cache format
      Add a terminus setting type
      Merge branch 'ticket/3.x/16058-pson-catalog-cache' into 3.x
      Merge branch '2.7.x' into 3.x
      Don't pollute Functions namespace in shellquote function
      Backport fix for commandline spec
      Don't make executables in /tmp in posix_spec
      (#15733) Remove mongrel support
      (#15733) Remove servertype setting
      (#15733) Simplify bindaddress logic for webrick
      (#13563) Verify CSRs against the embedded public key
      (#15733) Use real arguments for Puppet::Network::Server
      (#15733) Remove excess hash arguments for webrick
      (#16275) Don't set $environment as a local fact
      Merge branch 'maint/3.x/merge-hiera-puppet-into-core' of https://github.com/daniel-pittman/puppet into 3.x
      Fix for windows paths in hiera-puppet specs
      Clean up acceptance tests merged from hiera-puppet
      Set ca_location in ca face
      (#13435) Use digest algorithm from CSR for fingerprint
      (#13435) Use new digest code when generating a CSR
      (#13435) Convert digest to string in cert interface
      (#13435) Use SHA256 for puppet agent --fingerprint
      Pass wrapped real scope to DataBinding
      (#16221) Make undef not override default parameters
      Extract methods from set_default_parameters and improve test coverage
      Stub DataBinding in undef param tests
      (#16757) Only load rubygems in bin/puppet
      (#16757) Don't load rubygems if bundler is running

Paul Mucur (1):
      Add pkgin package provider

Peter Meier (1):
      false vs. nil - supporting false as default value

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

Pieter van de Bruggen (2):
      Merge pull request #966 from kbarber/ticket/3.x/15676-ssl_acceptance_test_uses_localhost
      Merge pull request #965 from kbarber/ticket/3.x/15666-return_downstream_comms_error

R. Tyler Croy (6):
      Use a valid locale when setting LC_ALL in the exec posix provider test
      Introduce a Gemfile to make dependency management easier for new (and old) contributors
      Add the parallel_tests gem to the Gemfile for speedier specs
      Remove the unnecessary Gemfile.lock
      Switch Rakefile off deprecated rake/gempackagetask
      Switch Rakefile off deprecated rake/gempackagetask

R.I.Pienaar (25):
      First working hiera() function and a logger that logs using puppet notice/debug
      Add a hash like wrapper around puppet scope
      Add a puppet backend that impliments Nigels design
      Add README
      Add a debug statement
      Add tests and fix bugs found with tests
      Add more tests, fix more bugs
      Rename tests dir to unit dir for consistancy with other projects
      Improve sample config and mention installation pains
      Add a example setup
      Fix formating and make clearer
      Improve example
      Add apache 2 lic
      Add array search support
      Fix spec failure
      Add a hiera_include() function and update example
      Add a hiera_array() function and fix args parsing
      Update changes
      Release 0.2.0
      Merge pull request #2 from jeffmccune/minor/master/readme_tweaks
      Merge pull request #3 from hunner/hash_support
      Merge pull request #7 from duritong/master
      Merge pull request #9 from crayfishx/master
      Add tests to scope for calling_class and calling_module handling
      Merge pull request #16 from stahnma/release

Rahul (1):
      12465 : update the service to use its own pid at /var/run/puppet.pid

Rahul Gopinath (3):
      (#15686) Ensure exception message is a string
      (#15686) Refactor install and uninstall methods
      (#8288) pkgadd - allow -G to be specified as an install option

Ricky Zhou (1):
      Fixes #8119 - Write to a temporary file and move when storing reports.

Roman Barczyński (1):
      (#15665) Fix issue with eix-update on newer eix (>=0.25.2).

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

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

Sean Millichamp (7):
      (#10328) Add 'weekday' parameter to schedule type
      (#10328) Convert class variable to instance variable
      (#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 (9):
      maint: Refactor suntab and aixtab filetype
      (#14283) Fix suntab filetype when run as normal user
      maint: Rearrange tests in useradd unittests
      maint: Reduce stubbing in useradd spec
      (#15959) Do not support system user on Solaris and HP-UX
      maint: Rearrange tests in groupadd unittests
      maint: Reduce stubbing in groupadd spec
      (#15959) Do not support system group on Solaris and HP-UX
      (#15959) Fix groupadd/useradd spec when run on non-linux systems

Steven Lindberg (5):
      (#7962) Added settings class for handling time intervals.
      (#7962) Added rate-limiting logger utility
      (#7962) Added `from_instance()` method to base SSL class
      (#7962) Added certificate expiration 'nearness' logic
      (#7962) Added certificate expiration checks.

Stig Sandbeck Mathisen (2):
      Imported Upstream version 3.0.0
      Imported Upstream version 3.0.1

Stijn Tintel (2):
      (#16801) Remove lib/puppet/network/http/mongrel
      (#16801) Remove mongrel_spec.rb as it is no longer in use.

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

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

Whyme.Lyu (6):
      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

Will Farrington (1):
      Fix up dependencies for Hiera and Facter in RubyGems.

Will Hopper (2):
      Update Debian packaging rake task to correctly create the orig.tar.gz
      Update Debian packaging rake task to correctly create the orig.tar.gz

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

cprice (31):
      (#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
      (#12490) fixing windows spec tests
      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
      Fix ruby 1.8.5 failures for execution_spec
      More fixes / cleanup for 1.8.5
      (#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
      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
      (#14609) Fix master initialization when running under Passenger

lifton (2):
      Merge pull request #471 from pcarlisle/clear_deprecations
      Merge pull request #573 from nicklewis/helpful-name-resolution-failure-message

nfagerlund (10):
      Maint: Fix borked help/man output for node clean
      Merge pull request #1007 from nfagerlund/tickets/master/11686
      Fix typo in create_resources function's description string
      Merge pull request #1058 from nfagerlund/typo/2.7.x/create_resources
      Maint: Large or complex HEREDOC strings w/ no interpolation should be single-quote type
      Update docs w/ new default logoutput value from ticket #10907
      Merge pull request #1175 from nfagerlund/maint/10907/update_logoutput_docs
      Update description of HTTP/HTTPS report
      (#16585) Remove dead ldapnodes setting
      Merge pull request #1186 from nfagerlund/http_report

pcarlisle (26):
      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 #605 from cprice-puppet/cleanup/master/remove-tabs-from-defaults
      Merge pull request #603 from cprice-puppet/bug/master/13439-spec-compatibility
      Merge pull request #682 from zaphod42/bug/master/enc-variables-not-overridden-by-node
      Merge pull request #771 from zaphod42/bug/master/14387-user-agent-for-module-tool
      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 #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 #850 from zaphod42/bug/3.0rc/14901-duplicate-args-remove-all-args
      Merge pull request #856 from zaphod42/bug/3.0rc/14844-service-provider-instances
      Merge pull request #877 from cprice-puppet/bug/3.0rc/15185-default-user-dirs-not-expanded
      Merge pull request #937 from daniel-pittman/maint/3.x/simplify-and-clarify-parser-code
      Merge pull request #935 from daniel-pittman/perf/3.x/zaml-performance
      Merge pull request #952 from daniel-pittman/bug/3.x/zaml-map-key-with-embedded-newline-corruption
      Merge pull request #932 from daniel-pittman/perf/3.x/symbolize-is-costly-compared-to-intern
      Merge pull request #930 from daniel-pittman/perf/3.x/2892-json-terminus-for-catalog-cache
      Merge pull request #941 from daniel-pittman/perf/3.x/disable-activesupport-dependencies-hooks
      Merge pull request #1016 from pcarlisle/maint/2.7.x/mocha12
      Merge pull request #1025 from joshcooper/ticket/2.7.x/14283-filetype-uid
      Merge pull request #1077 from vrthra/ticket/3.x/15886_refactor_zones
      Merge pull request #1088 from joshcooper/ticket/2.7.x/15560-managehome-windows
      Merge pull request #1103 from daniel-pittman/maint/3.x/ast-scope-only-uses-string-names
      Merge pull request #1099 from daniel-pittman/bug/2.7.x/8714-better-symlink-handling-in-selinux-utils

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

rahul (88):
      15547 : use a clean env for builtin check
      15547 : valid locales as sentinel and check
      15547 : Add home environemnt to pkgutil
      (#15547) remove the spaec between method and ()
      12465 : update the spec to make sure upgrade happens seamlessly.
      (#15547) mock of facter :operatingsystem pending
      (#15644) make sure parse_line is in scope
      (#15803) add self.instances to zpool provider
      (#10978) add instances to smf
      (#15804) add zfs instances
      (#15547) make sure that the LANG sentinels being used are present
      (#15569) ensure that augeas prints parse errors.
      (#15644) add test case to check for packages that are yet to be installed.
      (#8200) validate only if we can (especially path)
      (#7175) ensure ensurable uses symbols in zone
      (#15644) refactor the parse_line so that it supports the newer format
      (#15644) ensure that pkg installation is non-interactive
      (Maint) Fix assertion about locale to correct value.
      (#16157) Puppet should not print out spurious messages
      (#16157) ensure that mirror and raidz are used as subcommands
      (#16160) handle aclmode and shareiscsi removal.
      (#15547) correct 'pending' values to correct if check for solaris.
      (#8200) Ensure zonecfg errors are caught
      (Maint) Update the test cases to use the 'let'
      (#8200) Munge the ensurable value
      (#8200) Change path from parameter to property
      (Maint) : fix the jenkins failure for setconfig
      (#7986) make solaris pkg versionable.
      (#7986) check if pkg is the default provider for opensolaris
      (#6143) ensure that destroy works for zpools
      (Maint) dont fail on path unless absolutely required.
      (Maint) - simplify methods in ZoneMultiConfigProperty (adds wrap).
      (Maint) Type Zone : fix formatting, comments
      (#15886) Refactor state machine
      (Maint) simplify line2hash, ensure iptype exclusive property is correct
      (#15886) remove ZoneConfig and ZoneMultiConfig
      (#15886) getstatus should rename ip-type to iptype
      (#15886) commit the complete commands at the end.
      (maint) commit the complete commands at the end.
      (#16157) Fail rather than warn
      (Maint) split the long line
      (#16239) mock of facter :operatingsystem pending
      (Maint) stub FileTest.directory?
      (maint) Ignore the packaging workdirs
      (packaging) add ips packaging for solaris 11
      (maint) Update to tests for solaris
      (acceptance) utils: add zoneutils to acceptance lib
      (acceptance) zone: add test case to check for ip functionality
      (acceptance) zone: add test case to check for dataset functionality
      (acceptance) zone: path test cases
      (acceptance) zone: step zone states one at a time
      (acceptance) zone: test cases for the included statemachine
      (acceptance: #4840) add test case to verify zone creation
      (acceptance) utils: add cron utils
      (acceptance) cron: adds test cases for cron
      (acceptance) utils: add ips utils
      (acceptance) ips: adding ips test cases
      (acceptance) utils: add smf utils
      (acceptance) smf: add test cases
      (accpetance) utils: add zfs utils to helper
      (acceptance) zfs: add zfs test cases
      (acceptance) utils: add zpool utils to the acceptance helper
      (acceptance) zpool: add acceptance tests
      (acceptance) Fix incorrect command invocation.
      (acceptance) Fix incorrect command invocation.
      (acceptance) use facter to find the system name and fqdn
      (acceptance) Add documentation to the test cases.
      (acceptance) solaris : update package name for cron
      (acceptance) Move feature tests to 'resources'
      (acceptance) provide more rubust service script and fix smf
      (acceptance) fix zones: ensure that we pass a vallid interface name, fix name typo, sizes
      (acceptance) utils: cleanup - refactor zone utils so that we check before cleanup
      (acceptnace) disable two tests that fails in solaris temporarily.
      (acceptance) disable zone tests that require installation
      (#16239) mock of facter :operatingsystem pending
      (packaging) adds ips support for shipping and signing
      (#16425) ensure that first time install of speciifc version works
      (#16120) ips package provider gets feature holdable.
      (#16120) ips package provider gets feature holdable.
      (#16430) acceptance: refactor zone tests
      (#16430) acceptance: refactor cron tests
      (#16430) acceptance: refactor package ips
      (#16430) refactor smf tests
      (#16430) refactor zfs tests
      (#16430) refactor zpool test cases.
      (maint) convert user_role_add_spec to the new format of writing test cases.
      (maint) use described_class.new for getting the provider instance.
      (maint) add hiera to ext/envpuppet path and libpath

vrthra (11):
      Merge pull request #1064 from vrthra/ticket/3.x/8200_fix_jenkins_break
      Merge pull request #1094 from vrthra/ticket/3.x/15886_refactor_zones
      Merge pull request #1123 from vrthra/maint/fix_fqdn
      Merge pull request #1124 from vrthra/maint/fix_fqdn
      Merge pull request #1126 from branan/maint/strip_fqdn_for_certificate_gen
      Merge pull request #1142 from vrthra/ticket/3.x/16239_mock_facter_operatingsystem_pending
      Merge pull request #1146 from vrthra/packaging/ips_support
      Merge pull request #1147 from vrthra/ticket/3.x/16425_fix_ips_install
      Merge pull request #1149 from vrthra/ticket/3.x/16120_add_holdable_ips
      Merge pull request #1155 from vrthra/acceptance/3.x/16430_maint_refactor_solaris_tests
      Merge pull request #1168 from vrthra/maint/fix_user_add_testcase

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

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list