Merge branch '1.5.x' into 2.0.x

2018-05-25 18:45:37 -07:00
parent 606eb9dda3 e69296d7d3
commit 21d80d87a3
94 changed files with 401 additions and 341 deletions
--- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 server.port = 8443
 server.ssl.key-store = classpath:sample.jks
 server.ssl.key-store-password = secret
-server.ssl.key-password = password
+server.ssl.key-password = password