Merge branch '1.4.x' into 1.5.x

8 years ago · 733cfe9f70
parent 2a035d0748 51eb1ac04d
commit 733cfe9f70
3 changed files with 4 additions and 1 deletions
--- 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
 spring.artemis.embedded.queues=accounts
--- 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
--- 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
`@ -1 +1,2 @@`
	`logging.level.com.atomikos=WARN`	`logging.level.com.atomikos=WARN`
		`spring.artemis.embedded.queues=accounts`
`@ -1 +1,2 @@`
		`spring.artemis.embedded.queues=accounts`
	`logging.level.com.arjuna=INFO`	`logging.level.com.arjuna=INFO`