diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:24:52 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:24:52 -0700 |
| commit | 55b5e6885deb3c95ebd1f5c6bebc709624e78e0f (patch) | |
| tree | 2b6d7643daed47da2a1d4ad150238ec8b08d6296 | |
| parent | 22935580be94a9f0645c47826edbd77e3a1187a4 (diff) | |
| parent | 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd (diff) | |
Merge branch '2.4.x' into 3.0.x
* 2.4.x:
Disable tests that fail on 2.6.x due to #15912
0 files changed, 0 insertions, 0 deletions