[Pkg-puppet-devel] [facter] 85/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 bda8dd8bf65087b00f744fd840a73df542c366c6
Merge: d598f92 724102c
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Sat May 10 13:41:50 2014 -0700

    Merge branch 'stable' into facter-2

 acceptance/bin/ci-bootstrap-from-artifacts.sh |  4 ++--
 lib/facter/kernelmajversion.rb                |  8 ++++++++
 lib/facter/osfamily.rb                        |  2 +-
 spec/unit/kernelmajversion_spec.rb            | 23 ++++++++++++++---------
 spec/unit/osfamily_spec.rb                    |  1 -
 5 files changed, 25 insertions(+), 13 deletions(-)

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