diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:24:41 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:24:41 -0700 |
commit | 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd (patch) | |
tree | 8a737533940ddd4c6ea9ac4170a9e2f58ffa2709 /manifests | |
parent | 0f45feb31b0100c8f56ad9fff4542296cf51478f (diff) | |
parent | d2798b721a68d0e69fd22c4c806d1ae11c759f48 (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 'manifests')
0 files changed, 0 insertions, 0 deletions