[Pkg-puppet-devel] [facter] 13/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 ce56583aa01579c534ed1f81bd6779cd94414c1f
Merge: 49953fd 8835bc1
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Wed Mar 19 11:06:58 2014 -0700

    Merge branch 'stable' into facter-2

 lib/facter/operatingsystemmajrelease.rb     | 17 +++++++++++++++--
 lib/facter/operatingsystemrelease.rb        |  5 +++++
 lib/facter/version.rb                       |  2 +-
 spec/unit/operatingsystemmajrelease_spec.rb | 22 ++++++++++++++++++++++
 spec/unit/operatingsystemrelease_spec.rb    |  2 ++
 5 files changed, 45 insertions(+), 3 deletions(-)

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