Merge branch 'stable-2.13' into stable-2.14
authorKlaus Aehlig <aehlig@google.com>
Fri, 23 Oct 2015 07:52:51 +0000 (09:52 +0200)
committerKlaus Aehlig <aehlig@google.com>
Fri, 23 Oct 2015 08:08:29 +0000 (10:08 +0200)
* stable-2.13
  Renew-crypto: stop daemons on master node first
  Mention manual creation of {shared,}file paths in UPGRADE
  Don't warn about broken SSH setup of offline nodes

* stable-2.12
  Fix inconsistency in python and haskell objects
  Add notSerializeDefault default field option
  Move design-disks.rst to drafts

* stable-2.11
  Fix default for --default-iallocator-params

Conflicts:
src/Ganeti/THH.hs
Resolution:
take all additions

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Oleg Ponomarev <oponomarev@google.com>

13 files changed:
1  2 
doc/design-draft.rst
lib/backend.py
lib/cli.py
lib/cli_opts.py
lib/client/gnt_cluster.py
lib/cmdlib/cluster/verify.py
lib/cmdlib/node.py
lib/rpc_defs.py
lib/server/noded.py
src/Ganeti/Objects.hs
src/Ganeti/THH.hs
test/hs/Test/Ganeti/Objects.hs
test/py/ganeti.backend_unittest.py

Simple merge
diff --cc lib/backend.py
Simple merge
diff --cc lib/cli.py
Simple merge
diff --cc lib/cli_opts.py
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/rpc_defs.py
Simple merge
Simple merge
Simple merge
@@@ -61,10 -61,9 +61,11 @@@ module Ganeti.THH ( declareSAD
                    , andRestArguments
                    , withDoc
                    , defaultField
+                   , notSerializeDefaultField
 +                  , presentInForthcoming
                    , optionalField
                    , optionalNullSerField
 +                  , makeOptional
                    , renameField
                    , customField
                    , buildObject
@@@ -234,10 -230,13 +240,17 @@@ renameField constrName field = field { 
  defaultField :: Q Exp -> Field -> Field
  defaultField defval field = field { fieldDefault = Just defval }
  
+ -- | A defaultField which will be serialized only if it's value differs from
+ -- a default value.
+ notSerializeDefaultField :: Q Exp -> Field -> Field
+ notSerializeDefaultField defval field =
+   field { fieldDefault = Just defval
+         , fieldSerializeDefault = False }
 +-- | Mark a field as present in the forthcoming variant.
 +presentInForthcoming :: Field -> Field
 +presentInForthcoming field = field { fieldPresentInForthcoming = True }
 +
  -- | Marks a field optional (turning its base type into a Maybe).
  optionalField :: Field -> Field
  optionalField field = field { fieldIsOptional = OptionalOmitNull }
Simple merge
Simple merge