Browse Source

Merge branch '2.3.x'

pull/23886/head
Stephane Nicoll 5 years ago
parent
commit
cb31d9547c
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
  2. 4
      spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

2
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@ -2059,7 +2059,7 @@ @@ -2059,7 +2059,7 @@
},
{
"value": "iso",
"description": "ISO-8601 extended local time format"
"description": "ISO-8601 extended local time format."
},
{
"value": "iso-offset",

4
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
{
"name": "spring.banner.image.bitdepth",
"type": "java.lang.Integer",
"description": "The bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
"description": "Bit depth to use for ANSI colors. Supported values are 4 (16 color) or 8 (256 color).",
"defaultValue": 4
},
{
@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
{
"name": "spring.banner.image.pixelmode",
"type": "org.springframework.boot.ImageBanner$PixelMode",
"description": "The pixel mode to use when rendering the image.",
"description": "Pixel mode to use when rendering the image.",
"defaultValue": "TEXT"
},
{

Loading…
Cancel
Save