[Pkg-puppet-devel] [facter] 132/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 1183f153240d37cf0a4e0cf13cf7e224f1dc62a5
Merge: e17acc7 94448a7
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Fri Jun 13 16:36:05 2014 -0700

    Merge branch 'stable' into facter-2

 bin/facter                   |  4 ++++
 lib/facter/processor.rb      |  2 +-
 lib/facter/util/ip.rb        |  2 +-
 lib/facter/version.rb        |  2 +-
 spec/unit/interfaces_spec.rb | 18 +++++++++---------
 spec/unit/processor_spec.rb  |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)


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