diff options
| author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-10 11:52:03 -0700 |
|---|---|---|
| committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-10 11:52:03 -0700 |
| commit | b93a38c005546f8ed0086ca9473615648e2fcba8 (patch) | |
| tree | 0fe905c540c750f5ec90e906584af50999fa6121 /CHANGELOG | |
| parent | 424b56da616041e365cb471dafc05a3d7ade4e45 (diff) | |
| parent | e27eccb3567584d809c20cbf77baffcf99886200 (diff) | |
Merge branch '2.2.x' into 2.3.x
* 2.2.x:
Disable tests that fail on 2.6.x due to #15912
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions