[Pkg-puppet-devel] [facter] 175/180: Merge branch 'facter-2' into stable

Stig Sandbeck Mathisen ssm at debian.org
Mon Jun 30 15:06:45 UTC 2014


This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 82f873439f2d515fb818838cc9cd2958d09e1859
Merge: 94448a7 a5e552d
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Tue Jun 24 12:55:24 2014 -0700

    Merge branch 'facter-2' into stable

 .travis.yml                                        |   3 +-
 Gemfile                                            |  14 ++
 acceptance/setup/common/00_EnvSetup.rb             |   2 +-
 ext/project_data.yaml                              |  15 +-
 lib/facter/core/execution/base.rb                  |   6 +-
 lib/facter/core/suitable.rb                        |   6 +-
 lib/facter/dhcp_servers.rb                         |  39 ++++
 lib/facter/ec2.rb                                  |  59 +++---
 lib/facter/ec2/rest.rb                             | 130 ++++++++++++
 lib/facter/fqdn.rb                                 |   2 +
 lib/facter/gce.rb                                  |  16 ++
 lib/facter/gce/metadata.rb                         |  87 ++++++++
 lib/facter/kernelrelease.rb                        |   8 +
 lib/facter/memory.rb                               |  36 ++--
 lib/facter/netmask.rb                              |   2 +-
 lib/facter/operatingsystem.rb                      |  20 ++
 lib/facter/operatingsystemmajrelease.rb            |   3 +-
 lib/facter/operatingsystemrelease.rb               |  19 ++
 lib/facter/osfamily.rb                             |   4 +-
 lib/facter/partitions.rb                           |  35 +++
 lib/facter/physicalprocessorcount.rb               |   9 +
 lib/facter/processor.rb                            |  48 ++---
 lib/facter/util/config.rb                          |   4 +-
 lib/facter/util/dhcp_servers.rb                    |  43 ++++
 lib/facter/util/ec2.rb                             |   5 +
 lib/facter/util/formatter.rb                       |   3 +-
 lib/facter/util/loader.rb                          |  11 +-
 lib/facter/util/manufacturer.rb                    |   5 +-
 lib/facter/util/memory.rb                          |  24 +--
 lib/facter/util/netmask.rb                         |   2 +-
 lib/facter/util/operatingsystem.rb                 |  21 ++
 lib/facter/util/partitions.rb                      |  41 ++++
 lib/facter/util/partitions/linux.rb                |  65 ++++++
 lib/facter/util/posix.rb                           |  16 ++
 lib/facter/util/processor.rb                       |  18 +-
 lib/facter/util/values.rb                          |  29 +++
 lib/facter/util/virtual.rb                         |  35 ++-
 lib/facter/util/windows_root.rb                    |  34 +--
 lib/facter/version.rb                              |   2 +-
 lib/facter/virtual.rb                              |  65 ++++--
 schema/facter.json                                 |  19 ++
 spec/fixtures/ifconfig/openbsd_bridge_rules        |  11 +
 spec/fixtures/unit/dhcp_servers/nmcli_devices      |   4 +
 .../unit/dhcp_servers/nmcli_devices_disconnected   |   4 +
 spec/fixtures/unit/dhcp_servers/nmcli_eth0_dhcp    |  36 ++++
 spec/fixtures/unit/dhcp_servers/nmcli_eth0_static  |  24 +++
 spec/fixtures/unit/dhcp_servers/nmcli_wlan0_dhcp   |  49 +++++
 spec/fixtures/unit/dhcp_servers/nmcli_wlan0_static |  37 ++++
 spec/fixtures/unit/dhcp_servers/route              |   3 +
 spec/fixtures/unit/dhcp_servers/route_nogw         |   1 +
 spec/fixtures/unit/ec2/rest/meta-data/root         |  20 ++
 spec/fixtures/unit/gce/metadata/metadata.json      |  69 ++++++
 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 +
 .../unit/memory/smartos_zone_swap_l-single         |   2 +
 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/fixtures/unit/netmask/ifconfig_aix_7.txt      |   3 +
 spec/fixtures/unit/util/dhcp_servers/route         |   3 +
 spec/fixtures/unit/util/dhcp_servers/route_nogw    |   1 +
 spec/fixtures/unit/util/loader/nosuchfact.rb       |   1 -
 .../unit/util/operatingsystem/cumuluslinux.txt     |   8 +
 .../unit/util/operatingsystem/redhat-7.txt         |  12 ++
 .../fixtures/unit/util/operatingsystem/sabayon.txt |   7 +
 spec/fixtures/unit/util/operatingsystem/wheezy.txt |   9 +
 .../fixtures/unit/util/partitions/partitions/mount |   9 +
 spec/fixtures/virtual/proc_1_cgroup/in_a_container |   9 +
 .../virtual/proc_1_cgroup/in_a_docker_container    |   8 +
 .../virtual/proc_1_cgroup/not_in_a_container       |   9 +
 spec/spec_helper.rb                                |   2 +-
 spec/unit/core/execution/base_spec.rb              |   8 +-
 spec/unit/core/execution/posix_spec.rb             |   4 +-
 spec/unit/core/suitable_spec.rb                    |  10 +
 spec/unit/dhcp_servers_spec.rb                     | 152 +++++++++++++
 spec/unit/ec2/rest_spec.rb                         | 145 +++++++++++++
 spec/unit/ec2_spec.rb                              | 234 ++++++++-------------
 spec/unit/fqdn_spec.rb                             |  16 ++
 spec/unit/gce/metadata_spec.rb                     |  49 +++++
 spec/unit/gce_spec.rb                              |  34 +++
 spec/unit/kernelrelease_spec.rb                    |  16 ++
 spec/unit/macaddress_spec.rb                       |  12 ++
 spec/unit/memory_spec.rb                           | 175 +++++----------
 spec/unit/netmask_spec.rb                          |  11 +
 spec/unit/operatingsystem_spec.rb                  |  19 ++
 spec/unit/operatingsystemmajrelease_spec.rb        |   2 +-
 spec/unit/operatingsystemrelease_spec.rb           |   8 +
 spec/unit/osfamily_spec.rb                         |   4 +
 spec/unit/partitions_spec.rb                       |  48 +++++
 spec/unit/physicalprocessorcount_spec.rb           |   9 +
 spec/unit/processor_spec.rb                        |  18 +-
 spec/unit/util/config_spec.rb                      |  13 ++
 spec/unit/util/dhcp_servers_spec.rb                |  63 ++++++
 spec/unit/util/ec2_spec.rb                         |   4 +
 spec/unit/util/formatter_spec.rb                   |  50 +++++
 spec/unit/util/loader_spec.rb                      |   8 +-
 spec/unit/util/macosx_spec.rb                      |   5 +-
 spec/unit/util/manufacturer_spec.rb                |  33 +++
 spec/unit/util/operatingsystem_spec.rb             |  92 ++++++++
 spec/unit/util/partitions/partitions_spec.rb       |  67 ++++++
 spec/unit/util/partitions_spec.rb                  |  19 ++
 spec/unit/util/posix_spec.rb                       |  11 +
 spec/unit/util/values_spec.rb                      |  40 ++++
 spec/unit/util/virtual_spec.rb                     |  74 ++++++-
 spec/unit/virtual_spec.rb                          |  85 ++++++--
 115 files changed, 2479 insertions(+), 470 deletions(-)

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



More information about the Pkg-puppet-devel mailing list