Merge branch '1.5.x'

wilkinsona · wilkinsona · commit 4d64c9c93d41 · 2016-09-29T16:29:42.000+01:00
diff --git a/spring-boot-samples/spring-boot-sample-jta-atomikos/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-jta-atomikos/src/main/resources/application.properties
@@ -1 +1,2 @@
-logging.level.com.atomikos=WARN
+logging.level.com.atomikos=WARN
+spring.artemis.embedded.queues=accounts
diff --git a/spring-boot-samples/spring-boot-sample-jta-bitronix/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-jta-bitronix/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.artemis.embedded.queues=accounts
diff --git a/spring-boot-samples/spring-boot-sample-jta-narayana/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-jta-narayana/src/main/resources/application.properties
@@ -1 +1,2 @@
+spring.artemis.embedded.queues=accounts
 logging.level.com.arjuna=INFO

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-logging.level.com.atomikos=WARN`
	`1`	`+logging.level.com.atomikos=WARN`
	`2`	`+spring.artemis.embedded.queues=accounts`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+spring.artemis.embedded.queues=accounts`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+spring.artemis.embedded.queues=accounts`
`1`	`2`	`logging.level.com.arjuna=INFO`