Murat Kabilov ed0db7193c Merge branch 'master' into feature/diagnostic-rest-api ...

# Conflicts:
#	pkg/controller/controller.go
#	pkg/controller/postgresql.go

2017-07-27 14:32:19 +02:00

..

apiserver

go fmt

2017-07-27 11:27:08 +02:00

cluster

go fmt

2017-07-27 11:27:08 +02:00

controller

Merge branch 'master' into feature/diagnostic-rest-api

2017-07-27 14:32:19 +02:00

spec

Make use of kubernetes client-go v4

2017-07-25 15:25:17 +02:00

util

add pprof

2017-07-25 17:20:55 +02:00