On Wed, Oct 30, 2013 at 11:16 PM, Klaus Aehlig <[email protected]> wrote: > > commit 29f0042d6fa1262ef9501a21c5077a1cc704e66f > Merge: a8b1e9f cabc869 > Author: Klaus Aehlig <[email protected]> > Date: Wed Oct 30 17:21:29 2013 +0100 > > Merge branch 'stable-2.10' into master > > * stable-2.10 > Remove FIXME + update man pages wrt iallocator > Don't check for master netdev when using OVS > Fix TypeError in backend/ConfigureOVS > Create Open vSwitch on Master during Cluster init > SimpleRetry on BlockDev.Remove() > Show the key in "'None' is not a valid Maybe value" > Fix usage of xm/xl for gnt-instance modify --new-primary\ > Hs2Py constants (17 commits) > Fix default value for reason trail > Hotplug (23 patches) > > * stable-2.8 > Add all dependencies for confd as test dependencies > Add snap-server to the test-relevenat packages
s/relevenat/relevant/ > Placate warnings on ganeti.outils_unittest.py > > Conflicts: > lib/cmdlib/instance.py: trivial > src/Ganeti/Types.hs: use both additions > test/py/cmdlib/instance_unittest.py: manually > appply ff5def9 to version of master > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc src/Ganeti/Types.hs > index fa58f06,54b118f..63124fd > --- a/src/Ganeti/Types.hs > +++ b/src/Ganeti/Types.hs > @@@ -152,8 -152,10 +152,12 @@@ module Ganeti.Type > , RpcTimeout(..) > , rpcTimeoutFromRaw -- FIXME: no used anywhere > , rpcTimeoutToRaw > + , ImportExportCompression(..) > + , importExportCompressionToRaw > + , HotplugTarget(..) > + , hotplugTargetToRaw > + , HotplugAction(..) > + , hotplugActionToRaw > ) where > > import Control.Monad (liftM) > @@@ -837,13 -835,19 +841,30 @@@ $(THH.declareILADT "RpcTimeout > , ("OneDay", 86400) -- 1 day > ]) > > +$(THH.declareLADT ''String "ImportExportCompression" > + [ -- No compression > + ("None", "none") > + -- gzip compression > + , ("GZip", "gzip") > + ]) > +$(THH.makeJSONInstance ''ImportExportCompression) > + > +instance THH.PyValue ImportExportCompression where > + showValue = THH.showValue . importExportCompressionToRaw > ++ > + -- | Hotplug action. > + > + $(THH.declareLADT ''String "HotplugAction" > + [ ("HAAdd", "hotadd") > + , ("HARemove", "hotremove") > + , ("HAMod", "hotmod") > + ]) > + $(THH.makeJSONInstance ''HotplugAction) > + > + -- | Hotplug Device Target. > + > + $(THH.declareLADT ''String "HotplugTarget" > + [ ("HTDisk", "hotdisk") > + , ("HTNic", "hotnic") > + ]) > + $(THH.makeJSONInstance ''HotplugTarget) > > > -- > 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 Rest LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
