resolve rebase errors

docs/quickstart.md

@@ -49,15 +49,14 @@ git clone https://github.com/zalando/postgres-operator.git
 cd postgres-operator
 
 # apply the manifests in the following order
-kubectl create -f manifests/operatorconfiguration.crd.yaml  # registers the CRD
-kubectl create -f manifests/postgresql-operator-default-configuration.yaml  # configuration
+kubectl create -f manifests/configmap.yaml  # configuration
 kubectl create -f manifests/operator-service-account-rbac.yaml  # identity and permissions
 kubectl create -f manifests/postgres-operator.yaml  # deployment
 ```
 
 There is a [Kustomization](https://github.com/kubernetes-sigs/kustomize)
-manifest that [combines the mentioned resources](../manifests/kustomization.yaml).
-It can be used with kubectl 1.14 or newer as easy as:
+manifest that [combines the mentioned resources](../manifests/kustomization.yaml) -
+it can be used with kubectl 1.14 or newer as easy as:
 
 ```bash
 kubectl apply -k github.com/zalando/postgres-operator/manifests
@@ -120,15 +119,15 @@ kubectl get pod -l app.kubernetes.io/name=postgres-operator
 kubectl create -f manifests/minimal-postgres-manifest.yaml
 ```
 
-After the cluster manifest is submitted and passed the validation the operator
-will create Service and Endpoint resources and a StatefulSet which spins up new
-Pod(s) given the number of instances specified in the manifest. All resources
-are named like the cluster. The database pods can be identified by their number
-suffix, starting from `-0`. They run the [Spilo](https://github.com/zalando/spilo)
-container image by Zalando. As for the services and endpoints, there will be one
-for the master pod and another one for all the replicas (`-repl` suffix). Check
-if all components are coming up. Use the label `application=spilo` to filter and
-list the label `spilo-role` to see who is currently the master.
+After the cluster manifest is submitted the operator will create Service and
+Endpoint resources and a StatefulSet which spins up new Pod(s) given the number
+of instances specified in the manifest. All resources are named like the
+cluster. The database pods can be identified by their number suffix, starting
+from `-0`. They run the [Spilo](https://github.com/zalando/spilo) container
+image by Zalando. As for the services and endpoints, there will be one for the
+master pod and another one for all the replicas (`-repl` suffix). Check if all
+components are coming up. Use the label `application=spilo` to filter and list
+the label `spilo-role` to see who is currently the master.
 
 ```bash
 # check the deployed cluster

docs/reference/cluster_manifest.md

@@ -327,7 +327,6 @@ defined in the sidecar dictionary:
   (https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/)
   for environment variables. Optional.
 
-<<<<<<< HEAD
 * **resources**
   [CPU and memory requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container)
   for each sidecar container. Optional.
@@ -355,8 +354,3 @@ CPU and memory limits for the sidecar container.
 * **memory**
   memory limits for the sidecar container. Optional, overrides the
   `default_memory_limits` operator configuration parameter. Optional.
-=======
-  **Note**: The operator will not launch a cluster if sidecar containers are specified
-  but globally disabled in the configuration. The `enable_sidecars` option
-  must be set to `true`.
->>>>>>> efce5a5f... updated docs

glide.yaml

@@ -1,23 +0,0 @@
-package: github.com/zalando/postgres-operator
-import:
-- package: github.com/sirupsen/logrus
-  version: ^1.0.1
-- package: github.com/aws/aws-sdk-go
-  version: ^1.8.24
-  subpackages:
-  - aws
-  - aws/session
-  - service/ec2
-- package: github.com/lib/pq
-- package: github.com/motomux/pretty
-- package: k8s.io/apimachinery
-  version: kubernetes-1.11.3-beta.0
-- package: k8s.io/apiextensions-apiserver
-  version: kubernetes-1.11.3-beta.0
-- package: k8s.io/client-go
-  version: kubernetes-1.11.3-beta.0
-- package: k8s.io/code-generator
-  version: kubernetes-1.11.3-beta.0
-- package: k8s.io/gengo
-- package: gopkg.in/yaml.v2
-- package: github.com/mohae/deepcopy

manifests/configmap.yaml

@@ -43,7 +43,7 @@ data:
   # logical_backup_s3_secret_access_key: ""
   # logical_backup_s3_sse: "AES256"
   # logical_backup_schedule: "30 00 * * *"
-  master_dns_name_format: '{cluster}.{team}.staging.{hostedzone}'
+  master_dns_name_format: "{cluster}.{team}.staging.{hostedzone}"
   # master_pod_move_timeout: 10m
   # max_instances: "-1"
   # min_instances: "-1"