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-batch/src/main/java/sample/batch/SampleBatchApplication.java
+++ b/spring-boot-samples/spring-boot-sample-batch/src/main/java/sample/batch/SampleBatchApplication.java
@@ -64,8 +64,8 @@ public class SampleBatchApplication {
 	public static void main(String[] args) throws Exception {
 		// System.exit is common for Batch applications since the exit code can be used to
 		// drive a workflow
-		System.exit(SpringApplication.exit(SpringApplication.run(
-				SampleBatchApplication.class, args)));
+		System.exit(SpringApplication
+				.exit(SpringApplication.run(SampleBatchApplication.class, args)));
 	}

 }