Murat Kabilov 50aaa16574 Merge branch 'master' into fix/graceful-shutdown ...

# Conflicts:
#	pkg/cluster/cluster.go
#	pkg/cluster/exec.go
#	pkg/cluster/k8sres.go
#	pkg/cluster/pod.go
#	pkg/cluster/resources.go
#	pkg/cluster/util.go
#	pkg/cluster/volumes.go
#	pkg/controller/controller.go
#	pkg/controller/pod.go
#	pkg/controller/postgresql.go
#	pkg/controller/util.go
#	pkg/controller/util_test.go
#	pkg/spec/postgresql.go
#	pkg/spec/postgresql_test.go
#	pkg/util/util.go
#	pkg/util/util_test.go

2017-07-25 15:41:06 +02:00

..

cluster

Make use of kubernetes client-go v4

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

controller

Merge branch 'master' into fix/graceful-shutdown

2017-07-25 15:41:06 +02:00

spec

Make use of kubernetes client-go v4

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

util

Make use of kubernetes client-go v4

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