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 <[email protected]> Authored: Thu Nov 26 19:15:13 2015 +0100 Committer: AndyGee <[email protected]> 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(-) ----------------------------------------------------------------------
