spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 02:40:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2020-10-24 07:40:48 +02:00
parent 3adf167b47 d1e503602b
commit cb31d9547c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+1 -1
View File
@@ -2059,7 +2059,7 @@
},
{
"value": "iso",
"description": "ISO-8601 extended local time format"
"description": "ISO-8601 extended local time format."
},
{
"value": "iso-offset",
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+2 -2
View File
@@ -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 @@
{
"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"
},
{