Merge branch '1.5.x'

2016-10-03 22:47:11 -07:00
parent e6ab3cef73 a2315378d4
commit 53f50eda39
44 changed files with 803 additions and 718 deletions
--- a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java
@@ -43,8 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Dave Syer
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = { SampleSecureApplication.class,
-		TestConfiguration.class })
+@SpringBootTest(classes = { SampleSecureApplication.class, TestConfiguration.class })
 public class SampleSecureApplicationTests {

 	@Autowired