Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

289980f1

Commit 289980f1 authored 8 years ago by Murat Kabilov

Downloads
- Plain Diff

Merge branch 'feature/simplify-pod-events-processing' into client-go-3

# Conflicts:
#	pkg/cluster/cluster.go

parents f562ec83 8a3915f4

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

pkg/cluster/cluster.go 45 additions, 9 deletions

pkg/cluster/cluster.go
pkg/cluster/pod.go 0 additions, 17 deletions

pkg/cluster/pod.go
pkg/cluster/sync.go 1 addition, 6 deletions

pkg/cluster/sync.go
pkg/controller/pod.go 19 additions, 16 deletions

pkg/controller/pod.go
pkg/controller/postgresql.go 7 additions, 4 deletions

pkg/controller/postgresql.go
pkg/spec/types.go 6 additions, 5 deletions

pkg/spec/types.go

with 78 additions and 57 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