Merge ~nacc/ubuntu/+source/puppet:merge into ~ubuntu-server-dev/ubuntu/+source/puppet:ubuntu/devel

[Nish Aravamudan]

puppet (3.8.5-1ubuntu1) xenial; urgency=medium

  * Merge with Debian unstable. Remaining Ubuntu changes:
    - debian/puppet{,master}.init: Wait until the puppet and puppetmaster
      daemons are actually stopped before returning.
    - puppetmaster-common: Suggest instead of recommending ruby-activerecord
      and ruby-activerecord-deprecated-finders (universe).
  * Dropped changes:
    - fix wrong process name match in logrotate script. (actually
      dropped in 3.8.4-1ubuntu1, fixed in Debian in 3.8.2-1).

 -- Nishanth Aravamudan <email address hidden> Tue, 08 Mar 2016 08:31:35 -0800

[Robie Basak (racb)]

This one got done also I think?

Unmerged commits

1ab79c5... by Nish Aravamudan on 2016-03-08

update-maintainer

0b42dc2... by Nish Aravamudan on 2016-03-08

reconstruct-changelog

5f61ed5... by Nish Aravamudan on 2016-03-08

merge-changelogs

2bad362... by Nish Aravamudan on 2016-03-08

    - puppetmaster-common: Suggest instead of recommending ruby-activerecord
      and ruby-activerecord-deprecated-finders (universe).

88fe86d... by Nish Aravamudan on 2016-03-08

  * Merge with Debian unstable. Remaining Ubuntu changes:
    - fix wrong process name match in logrotate script.
    - debian/puppet{,master}.init: Wait until the puppet and puppetmaster
      daemons are actually stopped before returning.

71be067... by Robie Basak on 2016-02-18

Import version 3.8.5-1

Imported using git-dsc-commit.