Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

30770843

Commit 30770843 authored 8 years ago by Murat Kabilov

Downloads
- Plain Diff

Merge branch 'master' into feature/tests

# Conflicts:
#	pkg/cluster/k8sres.go
#	pkg/spec/types.go

parents ea0ed11e a8ed1e25

Branches feature/tests

No related tags found

No related merge requests found

Changes 15

Show whitespace changes

Inline Side-by-side

Showing

.travis.yml 16 additions, 0 deletions

.travis.yml
README.md 4 additions, 0 deletions

README.md
delivery.yaml 30 additions, 0 deletions

delivery.yaml
manifests/configmap.yaml 1 addition, 0 deletions

manifests/configmap.yaml
manifests/testpostgresql.yaml 1 addition, 0 deletions

manifests/testpostgresql.yaml
pkg/cluster/cluster.go 7 additions, 3 deletions

pkg/cluster/cluster.go
pkg/cluster/k8sres.go 52 additions, 26 deletions

pkg/cluster/k8sres.go
pkg/cluster/pod.go 7 additions, 7 deletions

pkg/cluster/pod.go
pkg/cluster/resources.go 56 additions, 4 deletions

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

pkg/cluster/sync.go
pkg/cluster/util.go 11 additions, 0 deletions

pkg/cluster/util.go
pkg/spec/postgresql.go 4 additions, 2 deletions

pkg/spec/postgresql.go
pkg/spec/types.go 2 additions, 1 deletion

pkg/spec/types.go
pkg/util/config/config.go 1 addition, 0 deletions

pkg/util/config/config.go
pkg/util/constants/annotations.go 6 additions, 5 deletions

pkg/util/constants/annotations.go

with 200 additions and 50 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please register or sign in to comment