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 /CHANGELOG | |
| parent | 9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba (diff) | |
| parent | cc670fb3b1294a348e9afa03b75cbed8eb08ca36 (diff) | |
Merge branch '2.x' into 3.x
* 2.x:
Update Modulefile, CHANGELOG for 2.5.1
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -17,6 +17,9 @@ 2012-04-10 - Chris Price <chris@puppetlabs.com> - 3.0.0 * (#13693) moving logic from local spec_helper to puppetlabs_spec_helper (85f96df) +2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 2.5.1 + * (maint) Fix spec failures resulting from Facter API changes (97f836f) + 2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0 * Add PE facts to stdlib (cdf3b05) |