You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ar...@apache.org on 2014/02/06 19:58:42 UTC
[2/2] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/activemq into trunk
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/activemq into trunk
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ae37bb1d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ae37bb1d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ae37bb1d
Branch: refs/heads/trunk
Commit: ae37bb1d59d5290cc21940a31d54e7511c1ceb18
Parents: 4985e08 04b721e
Author: artnaseef <ar...@artnaseef.com>
Authored: Thu Feb 6 11:58:11 2014 -0700
Committer: artnaseef <ar...@artnaseef.com>
Committed: Thu Feb 6 11:58:11 2014 -0700
----------------------------------------------------------------------
.../org/apache/activemq/ActiveMQConnection.java | 12 +++++
.../activemq/ActiveMQConnectionFactory.java | 19 +++++++-
activemq-leveldb-store/pom.xml | 47 ++++++++++++++++++++
.../activemq/ra/LocalAndXATransaction.java | 21 ++++++---
.../ActiveMQXAConnectionFactoryTest.java | 40 +++++++++++++++++
pom.xml | 15 +++++--
6 files changed, 143 insertions(+), 11 deletions(-)
----------------------------------------------------------------------