merge with master again

This commit is contained in:
Felix Kunde
2020-04-29 11:34:40 +02:00
17 changed files with 927 additions and 65 deletions
+2 -1
View File
@@ -1,9 +1,10 @@
package controller
import (
"k8s.io/apimachinery/pkg/types"
"time"
"k8s.io/apimachinery/pkg/types"
acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1"
)