diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:24:08 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:24:08 -0700 |
| commit | 73261f14ad07b158e4ab68dc7d0579f7cd6a9f6a (patch) | |
| tree | b08d6c0d76dc3a8350f3edcd12c2aeaeac614da1 | |
| parent | a8a4f93992d88bdee91f2c338b9338f1c530789a (diff) | |
| parent | 8fdd59547d89767cef1a58fdabeff25d51692cbf (diff) | |
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
0 files changed, 0 insertions, 0 deletions