[Pkg-puppet-devel] [facter] 165/352: Merge remote-tracking branch 'origin/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 e7abf588e43eefb3e7fd62f6749e396d85e7af52
Merge: 9b4caa3 5e3d6f3
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Thu Jan 16 20:05:31 2014 -0800

    Merge remote-tracking branch 'origin/stable' into facter-2

 lib/facter/version.rb          |  2 +-
 lib/facter/virtual.rb          |  2 +-
 spec/unit/util/virtual_spec.rb |  2 +-
 spec/unit/virtual_spec.rb      | 24 ++++++++++++------------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --cc lib/facter/version.rb
index 784b65e,7cfddf0..d3caa1c
--- 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.4'
+     FACTERVERSION = '1.7.5-rc1'
    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