[Pkg-puppet-devel] [facter] 299/352: 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 1d9d02ca4c38ec3d1b36ac87f814401de7dcfff1
Merge: e86bebe 4961ef5
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Thu Feb 27 16:40:11 2014 -0800

    Merge branch 'stable' into facter-2

 ext/redhat/facter.spec.erb | 8 ++++----
 lib/facter/version.rb      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --cc lib/facter/version.rb
index d3caa1c,5dfb817..a347dc7
--- a/lib/facter/version.rb
+++ b/lib/facter/version.rb
@@@ -1,13 -1,14 +1,13 @@@
  module Facter
    if not defined? FACTERVERSION then
-     FACTERVERSION = '1.7.5-rc1'
+     FACTERVERSION = '1.7.5'
    end
  
 -  ##
 -  # version is a public API method intended to always provide a fast and
 -  # lightweight way to determine the version of Facter.
 +  # Returns the running version of Facter.
    #
 -  # The intent is that software external to Facter be able to determine the
 -  # Facter version with no side-effects.  The expected use is:
 +  # @comment The intent is that software external to Facter be able to
 +  #   determine the Facter version with no side-effects.  The expected
 +  #   use is:
    #
    #     require 'facter/version'
    #     version = Facter.version

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