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
History
Murat Kabilov 035069137a Merge branch 'master' into feature/refactor-tpr 
# Conflicts:
#	cmd/main.go
#	pkg/cluster/cluster.go
#	pkg/controller/controller.go
#	pkg/controller/util.go
 		2017-07-24 21:21:42 +02:00
..
cluster Merge branch 'master' into feature/refactor-tpr 2017-07-24 21:21:42 +02:00
controller Merge branch 'master' into feature/refactor-tpr 2017-07-24 21:21:42 +02:00
spec Merge branch 'master' into feature/refactor-tpr 2017-07-24 21:21:42 +02:00
util Merge branch 'master' into feature/refactor-tpr 2017-07-24 21:21:42 +02:00