[Pkg-puppet-devel] [facter] 02/18: Merge pull request #974 from bodgit/docker

[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 7fb97e487e587bc14840451d691b939913a42f72
Merge: 20a41ef f075600
Author: Peter Huene <peterhuene at gmail.com>
Date:   Fri Jun 12 08:44:40 2015 -0700

    Merge pull request #974 from bodgit/docker
    
    (FACT-704) Fix docker detection for systemd slices

 lib/facter/util/virtual.rb                                    |  4 ++--
 .../proc_1_cgroup/in_a_docker_container_with_systemd_slices   | 10 ++++++++++
 spec/unit/util/virtual_spec.rb                                | 11 +++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

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