]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'ticket/v2.x/9080_add_static_facts' into v2.x
authorJeff McCune <jeff@puppetlabs.com>
Wed, 17 Aug 2011 23:32:46 +0000 (16:32 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Wed, 17 Aug 2011 23:32:46 +0000 (16:32 -0700)
* ticket/v2.x/9080_add_static_facts:
  (#9080) Add facts from /etc/puppetlabs/facts.d


Trivial merge