tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject [6/6] tomee git commit: Merge branch 'tomee-1.7.x' into tomee-1.7.3-prepare
Date Thu, 26 Nov 2015 18:15:41 GMT
Merge branch 'tomee-1.7.x' into tomee-1.7.3-prepare

# Conflicts:
#	.gitattributes


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/124eb43b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/124eb43b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/124eb43b

Branch: refs/heads/tomee-1.7.3-prepare
Commit: 124eb43b82263eaa05ff198c180d48660ef6b61e
Parents: 37ef9f6 62c58ff
Author: AndyGee <andy.is@gmx.de>
Authored: Thu Nov 26 19:15:13 2015 +0100
Committer: AndyGee <andy.is@gmx.de>
Committed: Thu Nov 26 19:15:13 2015 +0100

----------------------------------------------------------------------
 .../test/ManagedScheduledExecutorServiceTest.java            | 2 +-
 .../openejb/core/transaction/JtaTransactionPolicy.java       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



Mime
View raw message