[Pkg-puppet-devel] [facter] 271/352: Merge branch 'maint/facter-2/solaris-zone-uuid' 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 ca6e191dde60dffaeb22dbc729eb1e56498a11e7
Merge: bc85e8d a381187
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Fri Feb 14 16:21:47 2014 -0800

    Merge branch 'maint/facter-2/solaris-zone-uuid' into facter-2

 lib/facter/util/solaris_zones.rb | 6 +++---
 schema/facter.json               | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

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