[Pkg-puppet-devel] [facter] 125/180: Merge branch 'pr/687' 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 e0aeebd6b8a93f35b4eaf0370d8bb144544d0440
Merge: bf10636 e2b8fbc
Author: Josh Cooper <josh at puppetlabs.com>
Date:   Wed Jun 11 11:21:00 2014 -0700

    Merge branch 'pr/687' into facter-2
    
    * pr/687:
      (FACT-179) Resolve fqdn fact when domain is empty

 lib/facter/fqdn.rb     |  2 ++
 spec/unit/fqdn_spec.rb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

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