[Pkg-puppet-devel] [facter] 69/180: Merge branch 'pull-630' into facter-2

[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 8538fb91fc23ebf61cb6ed84d199289d5047063e
Merge: e48fc09 632041b
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Wed Apr 30 10:54:15 2014 -0700

    Merge branch 'pull-630' into facter-2

 lib/facter/util/virtual.rb                         | 13 ++++++++++
 lib/facter/virtual.rb                              | 13 ++++++++++
 spec/fixtures/virtual/proc_1_cgroup/in_a_container |  9 +++++++
 .../virtual/proc_1_cgroup/not_in_a_container       |  9 +++++++
 spec/unit/util/virtual_spec.rb                     | 30 ++++++++++++++++++++++
 spec/unit/virtual_spec.rb                          | 18 +++++++++++++
 6 files changed, 92 insertions(+)

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