diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:55:08 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:55:08 -0700 |
commit | effdfb845092fbe549c286926ac686aab1746a12 (patch) | |
tree | 66a8607f0e969c1124b81507449f16bb381d9032 /spec/spec_helper.rb | |
parent | 731c07e8768cbe39d75aa55f71fa69a06c6359c2 (diff) | |
parent | fd2ce0d24797b22022ecb14c32ffe88ff70de319 (diff) |
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
Diffstat (limited to 'spec/spec_helper.rb')
0 files changed, 0 insertions, 0 deletions