Author: Luke Kanies
Revision Date: 2008-04-28 22:52:02 UTC

I think I've now got the Webrick SSL support working.
Now I just need to get xmlrpc working alongside REST in
both mongrel and webrick.

Author: Stig Sandbeck Mathisen
Revision Date: 2012-07-11 13:41:33 UTC

releasing version 2.7.18-1

Author: Patrick Carlisle
Revision Date: 2012-02-23 23:48:46 UTC

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

Author: Patrick Carlisle
Revision Date: 2012-02-23 23:48:46 UTC

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

Author: Olli Helenius
Revision Date: 2011-10-03 08:54:22 UTC

Seems I have real problems writing changelog entries

Author: Andreas Moog
Revision Date: 2011-03-01 13:04:40 UTC

* debian/puppetmaster.default
  - fix remains of automated merge (LP: #726856)