public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-08 15:41:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/refactor-tpr

Browse Source 
# Conflicts:
#	cmd/main.go
#	pkg/cluster/cluster.go
#	pkg/controller/controller.go
#	pkg/controller/util.go
This commit is contained in:
Murat Kabilov
2017-07-24 21:21:42 +02:00
parent 72a8fcc9aa 4455f1b639
commit 035069137a
7 changed files with 197 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/spec/types.go
-1
View File
@@ -3,7 +3,6 @@ package spec
import (
"fmt"
"strings"
"database/sql"
"k8s.io/apimachinery/pkg/types"