Automatic merge from release/2.0.0 -> release/2.1.0

* commit '3aec2d3b3920c8115b24ba1663b5d653f57f090b':
  避免assign-secgrp参数传递不一致
This commit is contained in:
邱剑
2018-09-25 20:41:41 +08:00
+1 -1
View File
@@ -240,7 +240,7 @@ func (opts *ServerDeployOptions) Params() (*jsonutils.JSONDict, error) {
type ServerSecGroupOptions struct {
ID string `help:"ID or Name of server" metavar:"Guest" json:"-"`
SecGrp string `help:"ID of Security Group" metavar:"Security Group" positional:"true"`
Secgrp string `help:"ID of Security Group" metavar:"Security Group" positional:"true"`
}
type ServerSendKeyOptions struct {