[Pkg-puppet-devel] [facter] 13/18: Merge pull request #1262 from branan/revert/2.x/FACT-380

[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 10cc4a8ff48363abfef65496b3ce3c287c27dbd1
Merge: ee7669b 3043635
Author: Michael Smith <michael.smith at puppetlabs.com>
Date:   Mon Jan 25 14:44:35 2016 -0800

    Merge pull request #1262 from branan/revert/2.x/FACT-380
    
    Revert "(FACT-380) Use the interface of the default route for network facts"

 lib/facter/ipaddress.rb                            | 19 ++++++++++++-----
 lib/facter/ipaddress6.rb                           |  5 ++---
 lib/facter/macaddress.rb                           | 11 +++++++---
 lib/facter/netmask.rb                              | 10 +--------
 lib/facter/util/ip.rb                              | 17 ---------------
 lib/facter/util/netmask.rb                         |  6 ++++++
 .../net_route_all_with_multiple_interfaces         |  2 --
 .../fixtures/ifconfig/net_route_net_tools_1.60.txt |  3 ---
 .../ipaddress/net_route_multiple_127_addresses.txt |  3 ---
 .../unit/ipaddress/net_route_net_tools_1.60.txt    |  3 ---
 .../ipaddress/net_route_non_english_locale.txt     |  3 ---
 .../unit/ipaddress/net_route_ubuntu_1204.txt       |  3 ---
 ...fconfig_darwin_10_8_5.txt => darwin_10_8_5.txt} |  0
 .../netmask/net_route_multiple_127_addresses.txt   |  3 ---
 .../unit/netmask/net_route_net_tools_1.60.txt      |  3 ---
 .../unit/netmask/net_route_non_english_locale.txt  |  3 ---
 .../unit/netmask/net_route_ubuntu_1204.txt         |  3 ---
 spec/unit/ipaddress6_spec.rb                       | 20 ++++--------------
 spec/unit/ipaddress_spec.rb                        | 24 +++++++++++-----------
 spec/unit/macaddress_spec.rb                       |  7 +------
 spec/unit/netmask_spec.rb                          | 21 ++++---------------
 21 files changed, 52 insertions(+), 117 deletions(-)

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