Automatic merge from release/2.2.0 -> release/2.3.0

* commit 'e715c53d5f1e1fbf45e5d88bf138d839aae69169':
  perform class action 返回值为复数
This commit is contained in:
李泽玺
2018-10-10 12:07:50 +08:00
+1 -1
View File
@@ -357,7 +357,7 @@ func (this *ResourceManager) PerformClassAction(session *mcclient.ClientSession,
func (this *ResourceManager) PerformClassActionInContexts(session *mcclient.ClientSession, action string, params jsonutils.JSONObject, ctxs []ManagerContext) (jsonutils.JSONObject, error) {
path := fmt.Sprintf("/%s/%s", this.ContextPath(ctxs), url.PathEscape(action))
return this._post(session, path, params, this.Keyword)
return this._post(session, path, params, this.KeywordPlural)
}
func (this *ResourceManager) BatchPerformAction(session *mcclient.ClientSession, idlist []string, action string, params jsonutils.JSONObject) []SubmitResult {