Merge branch '1.2.x'

2015-10-07 23:34:08 -07:00
parent 47576354f7 6ab376e2e8
commit e473364e4e
507 changed files with 2659 additions and 2478 deletions
--- a/spring-boot-samples/spring-boot-sample-flyway/src/test/java/sample/flyway/SampleFlywayApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-flyway/src/test/java/sample/flyway/SampleFlywayApplicationTests.java
@@ -34,8 +34,8 @@ public class SampleFlywayApplicationTests {

 	@Test
 	public void testDefaultSettings() throws Exception {
-		assertEquals(new Integer(1), this.template.queryForObject(
-				"SELECT COUNT(*) from PERSON", Integer.class));
+		assertEquals(new Integer(1), this.template
+				.queryForObject("SELECT COUNT(*) from PERSON", Integer.class));
 	}

 }