From: Jeff McCune Date: Mon, 23 Jul 2012 22:55:08 +0000 (-0700) Subject: Merge branch 'maint/2.3.x/fix_rspec_puppet_load_order_issue' into 2.3.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=effdfb845092fbe549c286926ac686aab1746a12;p=puppet-stdlib.git 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 --- effdfb845092fbe549c286926ac686aab1746a12