[Pkg-puppet-devel] [facter] 16/18: Merge tag 'upstream/2.4.6'

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 40936372390158a1c4072615d43eadcc780f8281
Merge: 3a19cb6 da525a0
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Jan 27 09:10:30 2016 +0100

    Merge tag 'upstream/2.4.6'
    
    Upstream version 2.4.6
    
    # gpg: Signature made Wed 27 Jan 2016 09:10:27 AM CET
    # gpg:                using RSA key 0x7DBA958C1C055538
    # gpg: Good signature from "Stig Sandbeck Mathisen <ssm at fnord.no>" [ultimate]
    # gpg:                 aka "Stig Sandbeck Mathisen <ssm at debian.org>" [ultimate]
    # Primary key fingerprint: 799E 67EE E227 4803 1E05  A2DC 7DBA 958C 1C05 5538

 ext/debian/changelog                                          |  4 ++--
 ext/ips/facter.p5m                                            |  4 ++--
 ext/redhat/facter.spec                                        |  8 ++++----
 lib/facter/core/execution/posix.rb                            |  4 ++--
 lib/facter/gid.rb                                             |  2 +-
 lib/facter/processors/os.rb                                   |  2 +-
 lib/facter/util/virtual.rb                                    |  4 ++--
 lib/facter/version.rb                                         |  2 +-
 .../proc_1_cgroup/in_a_docker_container_with_systemd_slices   | 10 ++++++++++
 spec/unit/core/execution/posix_spec.rb                        | 10 ++++++++++
 spec/unit/gid_spec.rb                                         |  9 +++++++++
 spec/unit/processors/os_spec.rb                               |  2 ++
 spec/unit/util/virtual_spec.rb                                | 11 +++++++++++
 13 files changed, 57 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git