Merge branch 'master' into release/2.0.1

Author: rjeberhard

site/architecture.md

@@ -12,7 +12,7 @@ The operator is packaged in a [Docker image](https://hub.docker.com/r/oracle/web
 
 ```
 $ docker login
-$ docker pull oracle/weblogic-kubernetes-operator:2.0-rc2
+$ docker pull oracle/weblogic-kubernetes-operator:2.0
 ```
 
 For more details on acquiring the operator image and prerequisites for installing the operator, consult the [Quick Start guide](quickstart.md).

site/quickstart.md

@@ -37,7 +37,7 @@ $ docker login
 ```
 c.	Pull the operator image:
 ```
-$ docker pull oracle/weblogic-kubernetes-operator:2.0-rc2
+$ docker pull oracle/weblogic-kubernetes-operator:2.0
 ```
 d.	Pull the Traefik load balancer image:
 ```
@@ -99,7 +99,6 @@ c.  Use `helm` to install and start the operator from the directory you just clo
 $ helm install kubernetes/charts/weblogic-operator \
   --name sample-weblogic-operator \
   --namespace sample-weblogic-operator-ns \
-  --set image=oracle/weblogic-kubernetes-operator:2.0-rc2 \
   --set serviceAccount=sample-weblogic-operator-sa \
   --set "domainNamespaces={}" \
   --wait

sonar-project.properties

@@ -1,7 +1,11 @@
 # Required metadata
 sonar.projectKey=weblogic-kubernetes-operator
 sonar.projectName=WebLogic Kubernetes Operator
+<<<<<<< HEAD
 sonar.projectVersion=2.1
+=======
+sonar.projectVersion=2.0
+>>>>>>> master
 
 # Comma-separated paths to directories with sources (required)
 sonar.sources=operator/src/main/java