From: Jeff McCune Date: Thu, 29 Mar 2012 23:54:42 +0000 (-0700) Subject: Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d22fbe32cd626091b32c8a0c0a8c83771a0c999a;p=puppet-stdlib.git Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.x * ticket/2.2.x/13439_fix_spec_helper_try2: (#13439) Fix test failures with Puppet 2.6.x --- d22fbe32cd626091b32c8a0c0a8c83771a0c999a