Merge branch '1.1.x'

11 years ago · cd83c1c1b2
1 changed files with 1 additions and 1 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
@ -56,7 +56,7 @@ public interface ConfigurableEmbeddedServletContainer {
				@@ -56,7 +56,7 @@ public interface ConfigurableEmbeddedServletContainer {
 	void setSessionTimeout(int sessionTimeout);

 	/**
-	 * The session timeout in the specified {@link TimeUnit} (default 30 seconds). If 0 or
+	 * The session timeout in the specified {@link TimeUnit} (default 30 minutes). If 0 or
 	 * negative then sessions never expire.
 	 * @param sessionTimeout the session timeout
 	 * @param timeUnit the time unit