diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:19:21 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 15:19:21 -0700 |
| commit | 10c793f8f0bca08a42237bddd18100e649e80df1 (patch) | |
| tree | 6af2a0d42da80fc4f6698a0239278d0076a3cb07 /Modulefile | |
| parent | 60afdeda17f9672405d9f425fcc1b08f61f9adda (diff) | |
| parent | a033450ab32e8963d3124068b442bef636e25b5c (diff) | |
| download | puppet-stdlib-10c793f8f0bca08a42237bddd18100e649e80df1.tar.gz puppet-stdlib-10c793f8f0bca08a42237bddd18100e649e80df1.tar.bz2 | |
Merge branch '2.1.x' into 2.2.x
* 2.1.x:
Update CHANGELOG, Modulefile for 2.1.3
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'Modulefile')
| -rw-r--r-- | Modulefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ name 'puppetlabs-stdlib' -version '2.2.1' +version '2.2.2' source 'git://github.com/puppetlabs/puppetlabs-stdlib' author 'puppetlabs' license 'Apache 2.0' |