[Pkg-puppet-devel] [facter] 59/61: Merge tag 'upstream/1.7.3'

[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 87a19ed0939b0f56398b58fe355d9de6c555c410
Merge: b87928e 450bc8c
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Fri Nov 1 21:42:56 2013 +0100

    Merge tag 'upstream/1.7.3'
    
    Upstream version 1.7.3

 README.md                                          |    8 +
 Rakefile                                           |   14 +-
 acceptance/tests/no_errors_on_stderr.rb            |    6 +
 ext/build_defaults.yaml                            |    7 +-
 ext/debian/changelog                               |   10 +-
 ext/debian/control                                 |    4 +-
 ext/ips/facter.p5m                                 |    4 +-
 ext/osx/PackageInfo.plist                          |   36 ---
 ext/osx/createpackage.sh                           |  179 ---------------
 ext/osx/preflight                                  |  241 --------------------
 ext/osx/preflight.erb                              |   30 +++
 ext/osx/{prototype.plist => prototype.plist.erb}   |   12 +-
 ext/redhat/facter.spec                             |   10 +-
 install.rb                                         |    2 +-
 lib/facter/domain.rb                               |   14 +-
 lib/facter/hardwaremodel.rb                        |    9 +-
 lib/facter/ipaddress.rb                            |   20 +-
 lib/facter/ipaddress6.rb                           |   15 +-
 lib/facter/macaddress.rb                           |    2 +-
 lib/facter/netmask.rb                              |   19 ++
 lib/facter/util/directory_loader.rb                |    2 +-
 lib/facter/util/ip.rb                              |   32 ++-
 lib/facter/util/ip/windows.rb                      |  215 +++++++++++++++++
 lib/facter/util/macaddress.rb                      |   12 +-
 lib/facter/util/netmask.rb                         |    2 +-
 lib/facter/util/parser.rb                          |   49 ++--
 lib/facter/version.rb                              |    2 +-
 lib/facter/virtual.rb                              |   10 +-
 ...indows_netsh_addresses_with_multiple_interfaces |   35 ---
 .../unit/ipaddress/ifconfig_non_english_locale.txt |   18 ++
 spec/lib/facter_spec/windows_network.rb            |   64 ++++++
 spec/spec_helper.rb                                |   32 ++-
 spec/unit/architecture_spec.rb                     |    1 +
 spec/unit/domain_spec.rb                           |   43 +++-
 spec/unit/ec2_spec.rb                              |    2 +-
 spec/unit/facter_spec.rb                           |    4 +-
 spec/unit/hardwaremodel_spec.rb                    |   17 +-
 spec/unit/ipaddress6_spec.rb                       |  119 ++++++++--
 spec/unit/ipaddress_spec.rb                        |  122 ++++++++--
 spec/unit/macaddress_spec.rb                       |    4 -
 spec/unit/memory_spec.rb                           |   15 +-
 spec/unit/netmask_spec.rb                          |   67 +++++-
 spec/unit/util/ip/windows_spec.rb                  |   48 ++++
 spec/unit/util/ip_spec.rb                          |   30 +--
 spec/unit/util/macaddress_spec.rb                  |   62 ++++-
 spec/unit/util/parser_spec.rb                      |   35 ++-
 spec/unit/util/virtual_spec.rb                     |   13 +-
 spec/unit/zfs_version_spec.rb                      |    9 +-
 spec/unit/zpool_version_spec.rb                    |    9 +-
 49 files changed, 1016 insertions(+), 699 deletions(-)

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