Merge branch '2.x' into 3.x
* 2.x: Update Modulefile, CHANGELOG for 2.5.1 Conflicts: CHANGELOG Modulefile
This commit is contained in:
commit
f4c8c6b8de
1 changed files with 3 additions and 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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue