Merge branch '1.4.x' into 1.5.x

2016-12-19 12:36:57 -08:00
parent 9668006aea bd74c3d327
commit 4b9cba351b
330 changed files with 554 additions and 47 deletions
--- a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
+++ b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java
@@ -220,6 +220,7 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner {
 			}
 			return false;
 		}
+
 	}

 	/**