public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 9720ac1f7e b8bf97ab76
commit 6102b0368c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/status.go
View File

@ -32,7 +32,7 @@ func (c *Controller) ClusterStatus(team, cluster string) (*spec.ClusterStatus, e
return status, nil 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 { func (c *Controller) ClusterDatabasesMap() map[string][]string {
m := make(map[string][]string) m := make(map[string][]string)