lp:~zulcss/puppet/trunk

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

Contains signed tags; see bug 963525

4292. By Patrick Carlisle <email address hidden> on 2012-02-23

Merge branch '2.7.x'

* 2.7.x: (63 commits)
  Maint: Fix bad copy and paste
  (#12725) Fix puppet agent --listen on Windows
  (#11740) Wait on the handle from the PROCESS_INFORMATION structure
  (#12564) Stub CHILDSTATUS in all test cases, not just failure cases.
  Updating CHANGELOG and lib/puppet.rb for 2.7.11
  (#12412) Mark symbolic file modes test as pending on Windows
  Symbolic file mode test fixes when no mode change happens.
  Fix spec ordering failure on environment
  Updating CHANGELOG and lib/puppet.rb for 2.7.11
  Disable specs that use replace_file on Windows
  Disable replace_file on Windows
  Remove unnecessary fallbacks in change_{user,group}
  Document uid/gid-related methods in Puppet::Util
  Copy owner/group in replace_file
  (#12463) eliminate `secure_open` in favour of `replace_file`
  (#12460) use `replace_file` for the .k5login file
  (#12462) user_role_add: use `replace_file` for /etc/shadow
  (#12463) add secure `replace_file` to Puppet::Util
  (#12459) drop supplementary groups when permanently dropping UID
  (#12458) default to users primary group, not root, in `asuser`
  ...

Conflicts:
 lib/puppet/application/queue.rb
 lib/puppet/provider/package/openbsd.rb
 lib/puppet/util.rb
 spec/unit/network/http/webrick_spec.rb
 spec/unit/util_spec.rb
 test/lib/puppettest/servertest.rb

4291. By Daniel Pittman on 2012-02-22

Merge pull request #524 from cprice-puppet/bug/master/fix_backups_spec_test

Fix backups_spec, which fails if run by itself

4290. By Daniel Pittman on 2012-02-22

Merge pull request #518 from cprice-puppet/bug/master/7316-acceptance-tests

(#7316) Initial acceptance tests

4289. By Daniel Pittman on 2012-02-20

Merge pull request #241 from GregSutcliffe/pacman_aur_support

Extend Pacman provider for Archlinux to use Yaourt

4288. By Daniel Pittman on 2012-02-20

Merge pull request #508 from pmorch/doc-for-apply-noop

Add documentation for puppet apply --noop

4287. By Daniel Pittman on 2012-02-20

Merge pull request #512 from cprice-puppet/feature/master/improve-backtrace-logging

Minor improvement to backtrace logging

4286. By Daniel Pittman on 2012-02-15

Merge pull request #502 from cprice-puppet/bugs/master/fix_stderr_acceptance_tests

re-fix acceptance test related to logging changes

4285. By Daniel Pittman <email address hidden> on 2012-02-14

Merge remote-tracking branch 'origin/2.7.x'

Conflicts:
 acceptance/tests/resource/file/source_attribute.rb
 acceptance/tests/resource/file/ticket_8740_should_not_enumerate_root_directory.rb
 acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb
 lib/puppet/network/http/handler.rb

Signed-off-by: Daniel Pittman <email address hidden>

4284. By Daniel Pittman on 2012-02-14

Merge pull request #495 from cprice-puppet/cleanup/master/deprecated-util-execution-message

Clean up deprecation warning

4283. By Daniel Pittman on 2012-02-13

Merge pull request #491 from cprice-puppet/bugs/master/fix_stderr_acceptance_tests

Fix a few acceptance tests that were checking stderr