Skip to content

Commit 9e00168

Browse files
committed
Merge branch 'main' into unify-config-propertie
2 parents fc8509b + 4fd9a85 commit 9e00168

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

docs/modules/ROOT/partials/_configprops.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
|spring.cloud.kubernetes.config.labels | |
5353
|spring.cloud.kubernetes.config.name | |
5454
|spring.cloud.kubernetes.config.namespace | |
55-
|spring.cloud.kubernetes.config.retry | |
55+
|spring.cloud.kubernetes.config.read-type | `+++BATCH+++` |
56+
|spring.cloud.kubernetes.config.retry | |
5657
|spring.cloud.kubernetes.config.sources | |
5758
|spring.cloud.kubernetes.config.use-name-as-prefix | `+++false+++` |
5859
|spring.cloud.kubernetes.discovery.all-namespaces | `+++false+++` | if discovery is enabled for all namespaces
@@ -105,8 +106,9 @@
105106
|spring.cloud.kubernetes.secrets.labels | |
106107
|spring.cloud.kubernetes.secrets.name | |
107108
|spring.cloud.kubernetes.secrets.namespace | |
108-
|spring.cloud.kubernetes.secrets.retry | |
109+
|spring.cloud.kubernetes.secrets.read-type | `+++BATCH+++` |
110+
|spring.cloud.kubernetes.secrets.retry | |
109111
|spring.cloud.kubernetes.secrets.sources | |
110112
|spring.cloud.kubernetes.secrets.use-name-as-prefix | `+++false+++` |
111113

112-
|===
114+
|===

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"antora": "3.2.0-alpha.9",
3+
"antora": "3.2.0-alpha.10",
44
"@antora/atlas-extension": "1.0.0-alpha.5",
55
"@antora/collector-extension": "1.0.2",
66
"@asciidoctor/tabs": "1.0.0-beta.6",

spring-cloud-kubernetes-test-support/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>org.codehaus.mojo</groupId>
6565
<artifactId>exec-maven-plugin</artifactId>
66-
<version>3.6.0</version>
66+
<version>3.6.1</version>
6767
<executions>
6868
<execution>
6969
<goals>

0 commit comments

Comments
 (0)