[Pkg-puppet-devel] [facter] 09/180: Merge branch 'stable' 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 39ff1d96292dc0228b2fd43d46a0f267a4275f71
Merge: a2d9d4d 9078c0d
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Mon Mar 10 17:27:29 2014 -0700

    Merge branch 'stable' into facter-2

 lib/facter/util/solaris_zones.rb     | 8 ++++----
 lib/facter/util/uptime.rb            | 6 +++---
 spec/unit/util/solaris_zones_spec.rb | 4 ++--
 spec/unit/util/uptime_spec.rb        | 4 ++--
 spec/unit/zones_spec.rb              | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

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