diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:54:51 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:54:51 -0700 |
| commit | f4c8c6b8de9c74db6c4a95fc88120de9e4455f55 (patch) | |
| tree | 0664304a2a9579d60db2441f17cac4fbea6b3bed /lib/puppet/type | |
| parent | 9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba (diff) | |
| parent | cc670fb3b1294a348e9afa03b75cbed8eb08ca36 (diff) | |
| download | puppet-stdlib-f4c8c6b8de9c74db6c4a95fc88120de9e4455f55.tar.gz puppet-stdlib-f4c8c6b8de9c74db6c4a95fc88120de9e4455f55.tar.bz2 | |
Merge branch '2.x' into 3.x
* 2.x:
Update Modulefile, CHANGELOG for 2.5.1
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'lib/puppet/type')
0 files changed, 0 insertions, 0 deletions