[Pkg-puppet-devel] [facter] 324/352: Merge branch 'maint/stable/solaris-missing-commands' into stable

[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 9078c0d321d1a81e5d127ea051dc4110d8018d20
Merge: cad1ba4 f836535
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Mon Mar 10 17:27:17 2014 -0700

    Merge branch 'maint/stable/solaris-missing-commands' into stable

 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