]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8a4f93 8fdd595)
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)
* 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


Trivial merge
Puppet module for stdlib