]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
projects / puppet-stdlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e27eccb 3f44686)
Merge branch '2.1.x' into 2.2.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:03:48 +0000 (14:03 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:03:48 +0000 (14:03 -0700)
commita8a4f93992d88bdee91f2c338b9338f1c530789a
treeb08d6c0d76dc3a8350f3edcd12c2aeaeac614da1tree | snapshot
parente27eccb3567584d809c20cbf77baffcf99886200commit | diff
parent3f44686f1c0112cc0febaaa8ad844f02d85562cfcommit | diff
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
spec/unit/puppet/parser/functions/merge_spec.rb diff1 | diff2 | blob | history
Puppet module for stdlib