On Mon, Jun 29, 2015 at 05:38:10PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > From: Niklas Hambuechen <[email protected]> > > This renames the deprecated `printTestCase` to its replacement > `counterexample`, add provides a CPP-guarded fallback for QuickCheck < 2.7. > > Signed-off-by: Niklas Hambuechen <[email protected]> > Reviewed-by: Klaus Aehlig <[email protected]> > > Conflicts: > test/hs/Test/Ganeti/TestCommon.hs > test/hs/Test/Ganeti/Utils/Statistics.hs > Resolution: > test/hs/TeGst/Ganeti/TestCommon.hs: keep changes introduced > in 2.12 after the previous cherry-picking of this patch > test/hs/Test/Ganeti/Utils/Statistics.hs: keep the current limit > 1e-10 in prop_stddev_update > > Cherry-picked-from: 077c415a09f8c381ce788ebe6c065d8ccab60564 > Signed-off-by: Petr Pudlak <[email protected]> > --- > test/hs/Test/Ganeti/JQScheduler.hs | 8 ++++---- > test/hs/Test/Ganeti/SlotMap.hs | 8 ++++---- > test/hs/Test/Ganeti/TestCommon.hs | 1 + > test/hs/Test/Ganeti/Utils/Statistics.hs | 4 ++-- > 4 files changed, 11 insertions(+), 10 deletions(-)
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
