[Pkg-puppet-devel] [facter] 51/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 828b608e23402f3f6e9874c3411999d1efbc2cd2
Merge: 870390b 2ce8849
Author: Kylo Ginsberg <kylo at puppetlabs.com>
Date:   Thu Apr 10 17:24:25 2014 -0700

    Merge branch 'stable' into facter-2

 acceptance/Gemfile                                 |   1 +
 acceptance/Rakefile                                | 319 ++++++++++++
 acceptance/bin/ci-bootstrap-from-artifacts.sh      |  50 ++
 acceptance/config/git/options.rb                   |   6 +
 .../config/{centos-5.cfg => nodes/centos5.yaml}    |   0
 .../config/{fedora-19.cfg => nodes/fedora19.yaml}  |   0
 .../config/{fedora-19.cfg => nodes/fedora20.yaml}  |   8 +-
 .../config/{fedora-19.cfg => nodes/lucid.yaml}     |   8 +-
 .../config/{fedora-19.cfg => nodes/precise.yaml}   |   8 +-
 .../config/{redhat-6.cfg => nodes/rhel6.yaml}      |   0
 .../config/{fedora-19.cfg => nodes/rhel7.yaml}     |   8 +-
 .../{solaris-11.cfg => nodes/solaris-11.yaml}      |   0
 .../config/{fedora-19.cfg => nodes/solaris10.yaml} |   8 +-
 .../config/{fedora-19.cfg => nodes/squeeze.yaml}   |   8 +-
 .../config/{fedora-19.cfg => nodes/wheezy.yaml}    |   8 +-
 .../{windows-2003.cfg => nodes/windows-2003.yaml}  |   0
 acceptance/config/packages/options.rb              |   6 +
 acceptance/config/ubuntu-1004.cfg                  |  22 -
 acceptance/lib/helper.rb                           |   1 +
 acceptance/lib/puppet/acceptance/install_utils.rb  | 102 ++++
 acceptance/setup/{ => common}/00_EnvSetup.rb       |   9 +-
 .../setup/{ => git/pre-suite}/01_TestSetup.rb      |   0
 acceptance/setup/packages/pre-suite/010_Install.rb |  33 ++
 acceptance/tests/facter_json_output_validates.rb   |   3 -
 lib/facter/util/manufacturer.rb                    |  26 +-
 lib/facter/util/resolution.rb                      |   4 +
 .../fixtures/unit/util/manufacturer/smartos_smbios | 533 +++++++++++++++++++++
 spec/unit/util/manufacturer_spec.rb                |  11 +
 tasks/ci.rake                                      |  27 ++
 29 files changed, 1141 insertions(+), 68 deletions(-)

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