[Pkg-puppet-devel] [facter] 94/180: Merge branch 'feature/facter-2/fact-376-openbsd' 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 5555627d93f2bc07e815774b493c7737a0e73a3c
Merge: bda8dd8 588e422
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Mon May 12 16:28:26 2014 -0700

    Merge branch 'feature/facter-2/fact-376-openbsd' into facter-2

 lib/facter/kernelrelease.rb                        |   8 ++
 lib/facter/memory.rb                               |  36 +++--
 lib/facter/physicalprocessorcount.rb               |   9 ++
 lib/facter/processor.rb                            |  13 +-
 lib/facter/util/manufacturer.rb                    |   5 +-
 lib/facter/util/memory.rb                          |  14 +-
 lib/facter/util/posix.rb                           |  16 +++
 lib/facter/util/virtual.rb                         |   3 +-
 lib/facter/virtual.rb                              |   2 +-
 spec/fixtures/ifconfig/openbsd_bridge_rules        |  11 ++
 spec/fixtures/unit/kernelrelease/openbsd-5.3       |   2 +
 .../unit/kernelrelease/openbsd-5.3-current         |   3 +
 spec/fixtures/unit/memory/aix-svmon                |   9 ++
 spec/fixtures/unit/memory/aix-swap_l               |   2 +
 spec/fixtures/unit/memory/darwin-swapinfo-multiple |   3 +
 spec/fixtures/unit/memory/darwin-swapinfo-single   |   2 +
 spec/fixtures/unit/memory/darwin-vm_stat           |  13 ++
 spec/fixtures/unit/memory/dragonfly-vmstat         |   3 +
 spec/fixtures/unit/memory/freebsd-vmstat           |   3 +
 spec/fixtures/unit/memory/linux-proc_meminfo       |  10 ++
 spec/fixtures/unit/memory/openbsd-vmstat           |   3 +
 spec/fixtures/unit/memory/solaris-prtconf          |   4 +
 spec/fixtures/unit/memory/solaris-swap_l-multiple  |   3 +
 spec/fixtures/unit/memory/solaris-swap_l-single    |   2 +
 spec/fixtures/unit/memory/solaris-vmstat           |   3 +
 spec/unit/kernelrelease_spec.rb                    |  16 +++
 spec/unit/macaddress_spec.rb                       |  12 ++
 spec/unit/memory_spec.rb                           | 153 +++++----------------
 spec/unit/physicalprocessorcount_spec.rb           |   9 ++
 spec/unit/processor_spec.rb                        |  11 +-
 spec/unit/util/virtual_spec.rb                     |   4 +-
 spec/unit/virtual_spec.rb                          |  10 +-
 32 files changed, 235 insertions(+), 162 deletions(-)

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