From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 20 Aug 2012 21:03:48 +0000 (-0700)
Subject: Merge branch '2.1.x' into 2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a8a4f93992d88bdee91f2c338b9338f1c530789a;p=puppet-stdlib.git

Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  (Maint) Fix mis-use of rvalue functions as statements
  Add .rspec file to repo root

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
---

a8a4f93992d88bdee91f2c338b9338f1c530789a
diff --cc spec/unit/puppet/parser/functions/merge_spec.rb
index 9218b9d,a91dca7..db7d837
--- a/spec/unit/puppet/parser/functions/merge_spec.rb
+++ b/spec/unit/puppet/parser/functions/merge_spec.rb
@@@ -26,9 -33,8 +26,8 @@@ describe Puppet::Parser::Functions.func
    describe 'when calling merge on the scope instance' do
      it 'should require all parameters are hashes' do
        expect { new_hash = scope.function_merge([{}, '2'])}.should raise_error(Puppet::ParseError, /unexpected argument type String/)
--
      end
 +
      it 'should be able to merge two hashes' do
        new_hash = scope.function_merge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
        new_hash['one'].should   == '1'