Automatic merge from release/2.4.0 -> release/2.5.0

* commit '2bf3cac597363d85b352da0bd1f3a5ba29836861':
  make fmt

pkg/scheduler/cache/sync/default.go

@@ -21,9 +21,9 @@ func getUpdate(d []interface{}) ([]string, error) {
 
 func defaultSyncItems() []cache.CachedItem {
 	return []cache.CachedItem{
-		//newGlanceCache(),
-		//newNetworkCache(),
-		//newNetworksDataCache(),
+	//newGlanceCache(),
+	//newNetworkCache(),
+	//newNetworksDataCache(),
 	}
 }
 

pkg/scheduler/manager/task_queue.go

@@ -200,8 +200,8 @@ type TaskManager struct {
 func NewTaskManager(stopCh <-chan struct{}) *TaskManager {
 	return &TaskManager{
 		taskExecutorQueueManager: NewTaskExecutorQueueManager(stopCh),
-		stopCh:                   stopCh,
-		lock:                     sync.Mutex{},
+		stopCh: stopCh,
+		lock:   sync.Mutex{},
 	}
 }
 

pkg/util/aliyun/provider/provider.go

@@ -46,7 +46,7 @@ func (self *SAliyunProviderFactory) GetProvider(providerId, providerName, url, a
 
 func init() {
 	factory := SAliyunProviderFactory{
-		// providerTable: make(map[string]*SAliyunProvider),
+	// providerTable: make(map[string]*SAliyunProvider),
 	}
 	cloudprovider.RegisterFactory(&factory)
 }