diff options
| author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-10 11:52:40 -0700 |
|---|---|---|
| committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-10 11:52:40 -0700 |
| commit | bb1afc311c7d372bb6972504c3d5faa1eaeee6f0 (patch) | |
| tree | a44c6a71e750be3eda1d72f9a90167c147d74e69 /lib/puppet | |
| parent | cdd45298337df80aad757e81eb7457317219c1b7 (diff) | |
| parent | b93a38c005546f8ed0086ca9473615648e2fcba8 (diff) | |
Merge branch '2.3.x' into 2.4.x
* 2.3.x:
Disable tests that fail on 2.6.x due to #15912
Diffstat (limited to 'lib/puppet')
0 files changed, 0 insertions, 0 deletions