Automatic merge from release/2.2.0 -> release/2.3.0

* commit 'c8bc4c0598bb35f4c26245ebd503428f5a72a1e4':
  避免localtask failed时error一直是Task failed due to unknown remote errors
This commit is contained in:
邱剑
2018-11-23 20:22:07 +08:00
@@ -18,7 +18,7 @@ func init() {
func Error2TaskData(err error) jsonutils.JSONObject {
errJson := jsonutils.NewDict()
errJson.Add(jsonutils.NewString("ERROR"), "__status__")
errJson.Add(jsonutils.NewString(err.Error()), "reason")
errJson.Add(jsonutils.NewString(err.Error()), "__reason__")
return errJson
}