[Pkg-puppet-devel] [facter] 74/180: Merge branch 'maint/facter-2/dhcp-server-fixup' 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 a1aeb33ec236a3b1fb49909bda0d77f1183df9a8
Merge: 50541b9 60cba50
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Thu May 1 12:05:38 2014 -0700

    Merge branch 'maint/facter-2/dhcp-server-fixup' into facter-2

 lib/facter/util/dhcp_servers.rb |  6 +++---
 spec/unit/dhcp_servers_spec.rb  | 31 ++++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)

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