Merge remote-tracking branch 'local12x/1.2.x'

2015-10-19 12:56:55 -07:00
parent 5080e2d71f a79131f8d2
commit 1e4d974ec0
573 changed files with 791 additions and 360 deletions
--- a/spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-jta-atomikos/src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java
@@ -20,6 +20,7 @@ import org.hamcrest.Matcher;
 import org.hamcrest.core.SubstringMatcher;
 import org.junit.Rule;
 import org.junit.Test;
+
 import org.springframework.boot.test.OutputCapture;

 import static org.junit.Assert.assertThat;