Merge remote-tracking branch 'origin/databases-rest-endpoint' into databases-rest-endpoint

# Conflicts:
#	pkg/apiserver/apiserver.go
#	pkg/controller/status.go
This commit is contained in:
Oleksii Kliukin
2017-12-22 13:08:50 +01:00
+1 -1
View File
@@ -32,7 +32,7 @@ func (c *Controller) ClusterStatus(team, cluster string) (*spec.ClusterStatus, e
return status, nil
}
// GetClusterDatabasesMap returns for each cluster the list of databases running there
// ClusterDatabasesMap returns for each cluster the list of databases running there
func (c *Controller) ClusterDatabasesMap() map[string][]string {
m := make(map[string][]string)