Automatic merge from release/2.1.0 -> release/2.2.0

* commit '2ca12923c00efb4c6461431bb9410721dbd3fc1b':
  go fmt.
  去掉临时调试信息; gofmt
  去掉临时调试信息

pkg/util/logclient/logclient.go

@@ -2,7 +2,6 @@ package logclient
 
 import (
 	"fmt"
-
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
@@ -84,8 +83,7 @@ func AddActionLog(model IObject, action string, iNotes interface{}, userCred mcc
 		// 成功日志
 		logentry.Add(jsonutils.JSONTrue, "success")
 	}
-	// TODO delete tag when done.
-	notes = fmt.Sprintf("[a2]%s", notes)
+
 	logentry.Add(jsonutils.NewString(notes), "notes")
 
 	_, err := modules.Actions.Create(s, logentry)