Merge branch '1.1.x'

bc0132b6 · Phillip Webb · c678c1f7 · 10726ffe · bc0132b6
Commit bc0132b6 authored Dec 10, 2014 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

TomcatEmbeddedServletContainerFactory.java ...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java +1 -1

No files found.
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -82,7 +82,7 @@ import org.springframework.util.StringUtils;
 public class TomcatEmbeddedServletContainerFactory extends
 		AbstractEmbeddedServletContainerFactory implements ResourceLoaderAware {

-	private static final String DEFAULT_PROTOCOL = "org.apache.coyote.http11.Http11NioProtocol";
+	public static final String DEFAULT_PROTOCOL = "org.apache.coyote.http11.Http11NioProtocol";

 	private File baseDirectory;