Merge branch '1.5.x'

2016-11-30 08:31:41 +01:00
parent e7275b62dc ce66abdeac
commit 0568afc6cb
10 changed files with 17 additions and 17 deletions
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
@@ -85,7 +85,7 @@ public class Repackager {
 	}

 	/**
-	 * Add a listener that will be triggered to dispaly a warning if searching for the
+	 * Add a listener that will be triggered to display a warning if searching for the
 	 * main class takes too long.
 	 * @param listener the listener to add
 	 */