Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

postgres-operator
- Activity
- Members
- Terraform modules
- Model experiments

Snippets Groups Projects

28a63c69

An error occurred while retrieving diff files

Commit 28a63c69 authored Jul 25, 2017 by Murat Kabilov

Downloads
- Plain Diff

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

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

parents b70c5b3a 1f8b37f3

Branches

No related tags found

Loading

Changes 30

Show whitespace changes

Inline Side-by-side

Showing

cmd/main.go 20 additions, 62 deletions

cmd/main.go
glide.lock 73 additions, 152 deletions

glide.lock
glide.yaml 28 additions, 15 deletions

glide.yaml
pkg/cluster/cluster.go 32 additions, 31 deletions

pkg/cluster/cluster.go
pkg/cluster/exec.go 8 additions, 6 deletions

pkg/cluster/exec.go
pkg/cluster/filesystems.go 1 addition, 1 deletion

pkg/cluster/filesystems.go
pkg/cluster/k8sres.go 23 additions, 22 deletions

pkg/cluster/k8sres.go
pkg/cluster/pg.go 1 addition, 1 deletion

pkg/cluster/pg.go
pkg/cluster/pod.go 12 additions, 11 deletions

pkg/cluster/pod.go
pkg/cluster/resources.go 37 additions, 36 deletions

pkg/cluster/resources.go
pkg/cluster/sync.go 4 additions, 4 deletions

pkg/cluster/sync.go
pkg/cluster/util.go 18 additions, 17 deletions

pkg/cluster/util.go
pkg/cluster/volumes.go 16 additions, 15 deletions

pkg/cluster/volumes.go
pkg/controller/pod.go 10 additions, 25 deletions

pkg/controller/pod.go
pkg/controller/postgresql.go 86 additions, 63 deletions

pkg/controller/postgresql.go
pkg/controller/util.go 14 additions, 17 deletions

pkg/controller/util.go
pkg/controller/util_test.go 154 additions, 0 deletions

pkg/controller/util_test.go
pkg/spec/postgresql.go 8 additions, 29 deletions

pkg/spec/postgresql.go
pkg/spec/postgresql_test.go 17 additions, 18 deletions

pkg/spec/postgresql_test.go
pkg/spec/types.go 2 additions, 3 deletions

pkg/spec/types.go

with 564 additions and 528 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment