Commit d45c5c82 authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Merge branch 'stable-2.10' into stable-2.11



* stable-2.10
  Make network_vlan an optional OpParam
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parents 180173af dc02f6cb
......@@ -174,7 +174,10 @@ def _BuildOpcodeParams(op_id, include, exclude, alias):
if has_default or has_test:
buf.write(" (")
if has_default:
buf.write("defaults to ``%s``" % (default,))
if default == "":
buf.write("defaults to the empty string")
else:
buf.write("defaults to ``%s``" % (default,))
if has_test:
buf.write(", ")
if has_test:
......
......@@ -1689,5 +1689,5 @@ pAdminStateSource =
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"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment