[Pkg-puppet-devel] [facter] 14/180: 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 25f712d6f71c05ce3ea2e389d0840038e6f58967
Merge: ce56583 e694917
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Mon Mar 24 18:47:04 2014 -0700

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

 Gemfile                                            |  2 +-
 acceptance/config/{fedora-18.cfg => fedora-19.cfg} | 18 ++++++++----------
 lib/facter/core/execution.rb                       | 21 ++++++++++++++++-----
 lib/facter/core/execution/base.rb                  |  2 +-
 lib/facter/domain.rb                               |  4 ++--
 lib/facter/hostname.rb                             |  2 +-
 lib/facter/ipaddress.rb                            |  2 +-
 lib/facter/kernelrelease.rb                        |  2 +-
 lib/facter/util/resolution.rb                      |  2 +-
 lib/facter/util/solaris_zones.rb                   |  2 +-
 lib/facter/util/uptime.rb                          |  6 +++---
 spec/unit/core/execution/base_spec.rb              | 20 ++++++++++----------
 spec/unit/core/execution_spec.rb                   |  9 +++++++--
 spec/unit/domain_spec.rb                           | 10 +++++-----
 spec/unit/hardwareisa_spec.rb                      | 10 +++++-----
 spec/unit/hardwaremodel_spec.rb                    |  2 +-
 spec/unit/hostname_spec.rb                         |  8 ++++----
 spec/unit/id_spec.rb                               |  6 +++---
 spec/unit/ipaddress_spec.rb                        |  2 +-
 spec/unit/kernelrelease_spec.rb                    |  6 +++---
 spec/unit/kernelversion_spec.rb                    |  2 +-
 spec/unit/lsbdistcodename_spec.rb                  |  2 +-
 spec/unit/lsbdistid_spec.rb                        |  2 +-
 spec/unit/lsbdistrelease_spec.rb                   |  4 ++--
 spec/unit/lsbrelease_spec.rb                       |  2 +-
 spec/unit/processor_spec.rb                        | 10 +++++-----
 spec/unit/uniqueid_spec.rb                         |  6 +++---
 spec/unit/util/resolution_spec.rb                  |  2 +-
 spec/unit/util/solaris_zones_spec.rb               | 10 +++++-----
 spec/unit/util/uptime_spec.rb                      |  4 ++--
 spec/unit/zonename_spec.rb                         |  2 +-
 spec/unit/zones_spec.rb                            |  2 +-
 32 files changed, 99 insertions(+), 85 deletions(-)

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