From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 20 Aug 2012 21:24:08 +0000 (-0700)
Subject: Merge branch '2.1.x' into 2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=73261f14ad07b158e4ab68dc7d0579f7cd6a9f6a;p=puppet-stdlib.git

Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Disable tests that fail on 2.6.x due to #15912

Conflicts:
	spec/unit/puppet/parser/functions/getvar_spec.rb
	spec/unit/puppet/parser/functions/has_key_spec.rb
	spec/unit/puppet/parser/functions/merge_spec.rb
---

73261f14ad07b158e4ab68dc7d0579f7cd6a9f6a