]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.4.x'
authorPatrick Carlisle <patrick@puppetlabs.com>
Thu, 9 Aug 2012 22:22:13 +0000 (15:22 -0700)
committerPatrick Carlisle <patrick@puppetlabs.com>
Thu, 9 Aug 2012 22:22:13 +0000 (15:22 -0700)
* 2.4.x:
  Make sure functions are loaded for each test
  Use rvalue functions correctly
  (#2157) Make facts_dot_d compatible with external facts

Conflicts:
lib/facter/facter_dot_d.rb


Trivial merge