Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,175 Commits 23 Branches 0 Tags
187b4e706c778ec2e5f3fe4e2f61cb3d461efef4
Commit Graph

4 Commits

Author SHA1 Message Date
Phillip Webb
4f610fa5a1 Merge branch '1.1.x' 
Conflicts:
	spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
	spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
 2014-09-17 10:11:30 -07:00
Phillip Webb
62a5ce52d0 Backport Jetty/Tomcat SSL support 
Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1
 2014-09-17 10:08:05 -07:00
Phillip Webb
da5c36c3a9 Polish 2014-07-29 13:06:47 -07:00
Andy Wilkinson
0960908bd7 Add support for configuring SSL declaratively 
Both Tomcat and Jetty can now be configured to use SSL via the
environment (typically application.properties or application.yml)

Closes #1084
 2014-07-24 15:10:09 +01:00