Merge branch '2.1.x' into 2.2.x

Browse source

* 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

...

This commit is contained in:

Jeff McCune 2012-08-20 14:24:08 -07:00

parent a8a4f93992 8fdd59547d

commit 73261f14ad

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available