LGTM, thanks
On Fri, Jun 27, 2014 at 10:30 AM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > commit ff0af6fd33dbad2f2dfd1510d65e40e728674944 > Merge: 180173a dc02f6c > Author: Klaus Aehlig <[email protected]> > Date: Fri Jun 27 10:27:56 2014 +0200 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Make network_vlan an optional OpParam > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc src/Ganeti/OpParams.hs > index 170cf50,b0c6581..be25738 > --- a/src/Ganeti/OpParams.hs > +++ b/src/Ganeti/OpParams.hs > @@@ -1681,13 -1632,7 +1681,13 @@@ pNetworkLink > withDoc "Network link when connecting to a group" $ > simpleField "network_link" [t| NonEmptyString |] > > +pAdminStateSource :: Field > +pAdminStateSource = > + withDoc "Who last changed the instance admin state" . > + optionalField $ > + simpleField "admin_state_source" [t| AdminStateSource |] > + > pNetworkVlan :: Field > pNetworkVlan = > - withDoc "Network vlan when connecting to a group" $ > - simpleField "network_vlan" [t| String |] > + withDoc "Network vlan when connecting to a group" . > + defaultField [| "" |] $ stringField "network_vlan" > > > -- > 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 > -- -- Helga Velroyen | Software Engineer | [email protected] | 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
