On Tue, May 20, 2014 at 05:45:54PM +0200, Petr Pudlák wrote:
> LGTM, thanks
>
Sorry, I missed a semantical conflict (a new new parameter added
on both branches, that's two new parameters for the arbitrary
object), which I'd like to resolve as follows.
diff --cc test/hs/Test/Ganeti/OpCodes.hs
index 158d7ff,5129f7f..17161ed7
--- a/test/hs/Test/Ganeti/OpCodes.hs
+++ b/test/hs/Test/Ganeti/OpCodes.hs
@@@ -123,7 -125,7 +123,8 @@@ instance Arbitrary OpCodes.OpCode wher
case op_id of
"OP_TEST_DELAY" ->
OpCodes.OpTestDelay <$> arbitrary <*> arbitrary <*>
-- genNodeNamesNE <*> return Nothing <*> arbitrary <*> arbitrary
++ genNodeNamesNE <*> return Nothing <*> arbitrary <*> arbitrary <*>
++ arbitrary
"OP_INSTANCE_REPLACE_DISKS" ->
OpCodes.OpInstanceReplaceDisks <$> genFQDN <*> return Nothing <*>
arbitrary <*> arbitrary <*> arbitrary <*> genDiskIndices <*>
--
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
