Skip to content

Commit 576f728

Browse files
committed
Merge remote-tracking branch 'origin/istio-2.6.0' into release/2.6.0
2 parents 3e3c5fa + bf113a7 commit 576f728

File tree

48 files changed

+109501
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+109501
-642
lines changed

docs-source/content/faq/cannot-pull-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Here is an example of part of a domain custom resource file with the `imagePullS
9191
specified:
9292

9393
```
94-
apiVersion: "weblogic.oracle/v6"
94+
apiVersion: "weblogic.oracle/v7"
9595
kind: Domain
9696
metadata:
9797
name: domain1

docs-source/content/samples/simple/domains/domain-home-in-image/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ The content of the generated `domain.yaml`:
183183
#
184184
# This is an example of how to define a Domain resource.
185185
#
186-
apiVersion: "weblogic.oracle/v6"
186+
apiVersion: "weblogic.oracle/v7"
187187
kind: Domain
188188
metadata:
189189
name: domain1

docs-source/content/samples/simple/domains/domain-home-on-pv/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ The content of the generated `domain.yaml`:
151151
#
152152
# This is an example of how to define a Domain resource.
153153
#
154-
apiVersion: "weblogic.oracle/v6"
154+
apiVersion: "weblogic.oracle/v7"
155155
kind: Domain
156156
metadata:
157157
name: domain1

docs-source/content/samples/simple/domains/model-in-image/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -812,8 +812,8 @@ Copy the following to a file called `/tmp/mii-sample/mii-initial.yaml` or simila
812812
# This is an example of how to define a Domain resource.
813813
#
814814
# If you are using 3.0.0-rc1, then the version on the following line
815-
# should be `v7` not `v6`.
816-
apiVersion: "weblogic.oracle/v7"
815+
# should be `v8` not `v7`.
816+
apiVersion: "weblogic.oracle/v8"
817817
kind: Domain
818818
metadata:
819819
name: sample-domain1
@@ -937,8 +937,8 @@ Copy the following to a file called `/tmp/mii-sample/mii-initial.yaml` or simila
937937
# This is an example of how to define a Domain resource.
938938
#
939939
# If you are using 3.0.0-rc1, then the version on the following line
940-
# should be `v7` not `v6`.
941-
apiVersion: "weblogic.oracle/v6"
940+
# should be `v8` not `v7`.
941+
apiVersion: "weblogic.oracle/v7"
942942
kind: Domain
943943
metadata:
944944
name: sample-domain1

docs-source/content/samples/simple/domains/soa-domain/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ $ cat output/weblogic-domains/soainfra/domain.yaml
195195
# This is an example of how to define a Domain resource.
196196
#
197197
# If you are using 3.0.0-rc1, then the version on the following line
198-
# should be `v7` not `v6`.
199-
apiVersion: "weblogic.oracle/v6"
198+
# should be `v8` not `v7`.
199+
apiVersion: "weblogic.oracle/v7"
200200
kind: Domain
201201
metadata:
202202
name: soainfra

docs-source/content/samples/simple/elastic-stack/weblogic-domain/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ The following is a complete example of a domain custom resource with a `fluentd`
257257

258258
```yaml
259259
# If you are using 3.0.0-rc1, then the version on the following line
260-
# should be `v7` not `v6`.
261-
apiVersion: weblogic.oracle/v6
260+
# should be `v8` not `v7`.
261+
apiVersion: weblogic.oracle/v7
262262
kind: Domain
263263
metadata:
264264
labels:

docs-source/content/userguide/experimental/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Experimental features"
33
date: 2019-08-15T13:29:04-04:00
44
weight: 6
55
description: "Learn about experimental features included in the operator."
6-
draft: false
6+
draft: true
77
---
88

99
This section provides details of experimental features in the operator.

docs-source/content/userguide/experimental/istio.md

Lines changed: 0 additions & 231 deletions
This file was deleted.

0 commit comments

Comments
 (0)