]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'maint/2.3.x/fix_rspec_puppet_load_order_issue' into 2.3.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 23 Jul 2012 22:55:08 +0000 (15:55 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 23 Jul 2012 22:55:08 +0000 (15:55 -0700)
* maint/2.3.x/fix_rspec_puppet_load_order_issue:
  (Maint) Don't mock with mocha


Trivial merge