diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:03:48 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:03:48 -0700 |
| commit | a8a4f93992d88bdee91f2c338b9338f1c530789a (patch) | |
| tree | b08d6c0d76dc3a8350f3edcd12c2aeaeac614da1 /CHANGELOG | |
| parent | e27eccb3567584d809c20cbf77baffcf99886200 (diff) | |
| parent | 3f44686f1c0112cc0febaaa8ad844f02d85562cf (diff) | |
| download | puppet-stdlib-a8a4f93992d88bdee91f2c338b9338f1c530789a.tar.gz puppet-stdlib-a8a4f93992d88bdee91f2c338b9338f1c530789a.tar.bz2 | |
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
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions