[Pkg-puppet-devel] [facter] 33/352: Merge branch 'backport-processor_specs' into stable

[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 a6d12a58021be4bb829123c0a8ae62d8ec80b315
Merge: 77b2eab dec6f7d
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Tue Sep 24 19:11:15 2013 -0700

    Merge branch 'backport-processor_specs' into stable
    
    This backports a number of changes made spec/unit/processor_spec.rb that
    were causing merge conflicts with the stable branch.

 lib/facter/util/processor.rb                       |   2 +
 spec/fixtures/hpux/machinfo/superdome-server-SD32B |  53 ++++
 spec/fixtures/hpux/machinfo/superdome2-16s         |  31 +++
 spec/fixtures/processorcount/solaris-psrinfo       |  24 ++
 spec/unit/processor_spec.rb                        | 273 +++++++++------------
 5 files changed, 227 insertions(+), 156 deletions(-)

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