From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 29 Mar 2012 23:25:55 +0000 (-0700)
Subject: Merge branch 'ticket/2.2.x/13439_fix_spec_helper' into 2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cbdffb711fb109628ecdada9083f064b2e8d3a64;p=puppet-stdlib.git

Merge branch 'ticket/2.2.x/13439_fix_spec_helper' into 2.2.x

* ticket/2.2.x/13439_fix_spec_helper:
  (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
---

cbdffb711fb109628ecdada9083f064b2e8d3a64