diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:20:28 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:20:28 -0700 |
| commit | fea0b06bc828f452900943db962f4f7645bb0802 (patch) | |
| tree | af2b3e2db28fb5a9de84d0b9be908950cc852d81 /CHANGELOG | |
| parent | 6b8f9dd329b40e1598fffde540b7cd59ddae9c2e (diff) | |
| parent | 10c793f8f0bca08a42237bddd18100e649e80df1 (diff) | |
| download | puppet-stdlib-fea0b06bc828f452900943db962f4f7645bb0802.tar.gz puppet-stdlib-fea0b06bc828f452900943db962f4f7645bb0802.tar.bz2 | |
Merge branch '2.2.x' into 2.3.x
* 2.2.x:
(#13494) Specify the behavior of zero padded strings
Update CHANGELOG, Modulefile for 2.1.3
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3 +* (#11607) Add Rakefile to enable spec testing +* (#12377) Avoid infinite loop when retrying require json + 2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1 * (#13091) Fix LoadError bug with puppet apply and puppet_vardir fact |