]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.4.x' into 3.0.x
authorJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:52 +0000 (14:24 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 20 Aug 2012 21:24:52 +0000 (14:24 -0700)
commit55b5e6885deb3c95ebd1f5c6bebc709624e78e0f
tree2b6d7643daed47da2a1d4ad150238ec8b08d6296
parent22935580be94a9f0645c47826edbd77e3a1187a4
parent417d219aa6e42f2a16af42c98aa063fc1d9d2ecd
Merge branch '2.4.x' into 3.0.x

* 2.4.x:
  Disable tests that fail on 2.6.x due to #15912