Merge branch '2.1.x' into 2.2.x

See gh-19150
spring-projects · Nov 27, 2019 · f2bd27f · f2bd27f
2 parents abe0700 + f117dbe
commit f2bd27f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -665,6 +665,13 @@
       "description": "Whether initialization should be performed lazily.",
       "defaultValue": false
     },
+    {
+      "name": "spring.main.log-startup-info",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.springframework.boot.SpringApplication",
+      "description": "Whether to log information about the application when it starts.",
+      "defaultValue": true
+    },
     {
       "name": "spring.main.register-shutdown-hook",
       "type": "java.lang.Boolean",