Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
postgres-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
zalando
postgres-operator
Commits
7951e9cb
Commit
7951e9cb
authored
3 years ago
by
Felix Kunde
Browse files
Options
Downloads
Patches
Plain Diff
resolve conflict
parent
268a86a0
Branches
switchover-subscriber-fix-2
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pkg/cluster/cluster.go
+18
-8
18 additions, 8 deletions
pkg/cluster/cluster.go
pkg/cluster/pod.go
+23
-7
23 additions, 7 deletions
pkg/cluster/pod.go
pkg/cluster/types.go
+1
-0
1 addition, 0 deletions
pkg/cluster/types.go
with
42 additions
and
15 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
