]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commiteffdfb845092fbe549c286926ac686aab1746a12
tree66a8607f0e969c1124b81507449f16bb381d9032
parent731c07e8768cbe39d75aa55f71fa69a06c6359c2
parentfd2ce0d24797b22022ecb14c32ffe88ff70de319
Merge branch 'maint/2.3.x/fix_rspec_puppet_load_order_issue' into 2.3.x

* maint/2.3.x/fix_rspec_puppet_load_order_issue:
  (Maint) Don't mock with mocha