[Pkg-puppet-devel] [facter] 152/180: Merge branch 'pr/697' 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 83f1d52092d21dbe4ef333a8760541b0b80d747d
Merge: 413e2b7 a776efe
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Thu Jun 19 17:10:31 2014 -0700

    Merge branch 'pr/697' into facter-2
    
    * pr/697:
      (FACT-335) Add GCE metadata facts
      (FACT-335) implement GCE virtual fact

 lib/facter/gce.rb                             | 16 +++++
 lib/facter/gce/metadata.rb                    | 87 +++++++++++++++++++++++++++
 lib/facter/util/virtual.rb                    |  4 ++
 lib/facter/virtual.rb                         |  9 +++
 spec/fixtures/unit/gce/metadata/metadata.json | 69 +++++++++++++++++++++
 spec/unit/gce/metadata_spec.rb                | 49 +++++++++++++++
 spec/unit/gce_spec.rb                         | 34 +++++++++++
 spec/unit/util/virtual_spec.rb                | 10 +++
 spec/unit/virtual_spec.rb                     | 13 ++++
 9 files changed, 291 insertions(+)

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