Merge branch '1.2.x'

2015-10-12 14:12:20 +01:00
parent d90647d712 d33d068fae
commit 8ee8c9fe90
7 changed files with 20 additions and 41 deletions
--- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 server.port = 8443
-server.ssl.key-store = sample.jks
+server.ssl.key-store = classpath:sample.jks
 server.ssl.key-store-password = secret
-server.ssl.key-password = password
+server.ssl.key-password = password
--- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/resources/sample.jks
+++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/main/resources/sample.jks