]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.1.x' into 2.2.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:08 +0000 (14:24 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:08 +0000 (14:24 -0700)
commit73261f14ad07b158e4ab68dc7d0579f7cd6a9f6a
treeb08d6c0d76dc3a8350f3edcd12c2aeaeac614da1
parenta8a4f93992d88bdee91f2c338b9338f1c530789a
parent8fdd59547d89767cef1a58fdabeff25d51692cbf
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