~ubuntu-branches/ubuntu/wily/puppet/wily-proposed

Viewing all changes in revision 85.

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2015-09-09 12:50:52 UTC
  • mfrom: (3.1.68 sid)
  • Revision ID: package-import@ubuntu.com-20150909125052-25vg92ehgp059lxr
Tags: 3.7.2-5ubuntu1
* Merge with Debian; remaining changes:
  - fix wrong process name match in logrotate script.
  - Wait until the puppet and puppetmaster daemons are actually stopped
    before returning.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: