[Pkg-puppet-devel] [facter] 79/180: Merge remote-tracking branch 'jeffmccune/docker_support' into facter-2 (FACT-189)

[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 bee8827177f5ffa7aa3aae35eddefcdb08790826
Merge: 9463d50 071cdf6
Author: Iristyle <Iristyle at github>
Date:   Tue May 6 11:17:16 2014 -0700

    Merge remote-tracking branch 'jeffmccune/docker_support' into facter-2 (FACT-189)
    
    * jeffmccune/docker_support:
      Add docker detection to virtual and is_virtual facts

 lib/facter/util/virtual.rb                         | 15 +++++++++--
 lib/facter/virtual.rb                              | 11 ++++++++
 .../virtual/proc_1_cgroup/in_a_docker_container    |  8 ++++++
 spec/unit/util/virtual_spec.rb                     | 30 ++++++++++++++++++++++
 spec/unit/virtual_spec.rb                          | 18 +++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)

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