[Pkg-puppet-devel] [facter] 45/46: Merge tag 'upstream/1.7.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 29b77ad9f8ab3684d934c9deef00f182d1d009c3
Merge: bd307c4 7046085
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Thu Jul 11 11:14:09 2013 +0200

    Merge tag 'upstream/1.7.2'
    
    Upstream version 1.7.2

 Rakefile                                           |    6 +-
 ext/build_defaults.yaml                            |    4 +-
 ext/debian/changelog                               |    4 +-
 ext/ips/facter.p5m                                 |    4 +-
 ext/osx/preflight                                  |  204 ++++++++--------
 ext/osx/prototype.plist                            |    2 +-
 ext/redhat/facter.spec                             |    8 +-
 lib/facter/domain.rb                               |   21 +-
 lib/facter/ipaddress.rb                            |   10 +-
 lib/facter/processor.rb                            |    4 +-
 lib/facter/util/file_read.rb                       |    4 +
 lib/facter/util/ip.rb                              |    2 +-
 lib/facter/util/netmask.rb                         |    2 +-
 lib/facter/util/resolution.rb                      |    2 +-
 lib/facter/util/virtual.rb                         |    7 +-
 lib/facter/version.rb                              |    2 +-
 lib/facter/virtual.rb                              |  201 ++++++++--------
 .../unit/interfaces/ifconfig_net_tools_1.60.txt    |   19 ++
 .../interfaces/ifconfig_net_tools_1.60.txt.em1     |   10 +
 .../unit/interfaces/ifconfig_net_tools_1.60.txt.lo |    8 +
 .../ipaddress/ifconfig_multiple_127_addresses.txt  |   20 ++
 .../unit/netmask/ifconfig_net_tools_1.60.txt       |   19 ++
 .../fixtures/unit/netmask/ifconfig_ubuntu_1204.txt |   16 ++
 .../unit/util/virtual/invalid_unicode_dmi_entries  |  Bin 0 -> 74 bytes
 spec/shared_formats/parses.rb                      |    3 +
 spec/unit/domain_spec.rb                           |  243 +++++++++++---------
 spec/unit/interfaces_spec.rb                       |   26 +++
 spec/unit/ipaddress_spec.rb                        |    4 +
 spec/unit/netmask_spec.rb                          |   29 +++
 spec/unit/processor_spec.rb                        |    3 +-
 spec/unit/util/resolution_spec.rb                  |    2 +-
 spec/unit/util/virtual_spec.rb                     |    9 +
 spec/unit/virtual_spec.rb                          |    7 +
 33 files changed, 557 insertions(+), 348 deletions(-)

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