diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:47:48 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:47:48 -0700 |
| commit | 9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba (patch) | |
| tree | d77590b842275ab493ab304f681d5ac7a296496a /CHANGELOG | |
| parent | 4004a758b0c01ac17206a838f91f8cf5c57cc466 (diff) | |
| parent | 614b3fbf6c15893e89ed8654fb85596223b5b7c5 (diff) | |
Merge branch '3.1.x' into 3.x
* 3.1.x:
Revert "Revert "Merge branch '2.5.x' into 3.0.x""
Revert "Merge branch '2.5.x' into 3.0.x"
(maint) Fix spec failures resulting from Facter API changes
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions