root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity
spring-boot/spring-boot-samples/spring-boot-sample-tomcat-ssl
History
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
..
src Backport Jetty/Tomcat SSL support 2014-09-17 10:08:05 -07:00
pom.xml Backport Jetty/Tomcat SSL support 2014-09-17 10:08:05 -07:00
sample.jks Backport Jetty/Tomcat SSL support 2014-09-17 10:08:05 -07:00