On Tue, Oct 13, 2015 at 03:43:58PM +0200, 'Oleg Ponomarev' via ganeti-devel 
wrote:
> Default field with notSerializedDefault flag set is a default field which
> will be serialized only if it's value differs from the default one. This
> flag can be set by using notSerializedDefaultField field type instead of
> defaultField field type.
> 
> This field is introduced in order to fix a bug of inconsistency between
> haskell and python config modules which leads to inconsistent config
> after ganeti updgrade.
> 
> Cherry-picked from: c0a2c62b9ad96c3e35cae0ffdcdf63a09164f537
> 
> Signed-off-by: Oleg Ponomarev <[email protected]>
> ---
>  src/Ganeti/THH.hs | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)

When cherry-picking a patch, we also leave the old audit-trail in place. I.e., 
only
modify the log message by adding the "Cherry-picked-from: " line at the end, 
after
the previously existing "Signed-off-by: " and "Reviewed-by: " lines.

Otherwise LGTM to the cherry pick.

-- 
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle

Reply via email to