[Pkg-puppet-devel] [facter] 71/180: Merge branch 'pull-559' 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 50541b9160fe2196bcbd895c39a7b3210e039110
Merge: 8538fb9 ceb8cde
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Thu May 1 10:50:44 2014 -0700

    Merge branch 'pull-559' into facter-2
    
    This closes GH-559

 lib/facter/dhcp_servers.rb                         | 39 ++++++++++
 lib/facter/util/dhcp_servers.rb                    | 19 +++++
 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              |  4 ++
 spec/fixtures/unit/dhcp_servers/route_nogw         |  4 ++
 spec/unit/dhcp_servers_spec.rb                     | 84 ++++++++++++++++++++++
 11 files changed, 304 insertions(+)

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