public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
postgres-operator/pkg/controller
History
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
..
controller.go Merge branch 'master' into fix/graceful-shutdown 2017-07-25 15:41:06 +02:00
pod.go Merge branch 'master' into fix/graceful-shutdown 2017-07-25 15:41:06 +02:00
postgresql.go Merge branch 'master' into fix/graceful-shutdown 2017-07-25 15:41:06 +02:00
util.go Make use of kubernetes client-go v4 2017-07-25 15:25:17 +02:00
util_test.go Make use of kubernetes client-go v4 2017-07-25 15:25:17 +02:00