Skip to content
Snippets Groups Projects
Commit 73261f14 authored by Jeff McCune's avatar Jeff McCune
Browse files

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
parents a8a4f939 8fdd5954
Branches azuregraphdocs
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment