You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/03/02 14:13:06 UTC

[2/2] activemq-6 git commit: Merge PR #127

Merge PR #127


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/4152eba7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/4152eba7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/4152eba7

Branch: refs/heads/master
Commit: 4152eba77a40aa34b20d9f5d6d5d3c4a741b81d5
Parents: 2e0e662 d5846dd
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Mar 2 13:12:19 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Mar 2 13:12:19 2015 +0000

----------------------------------------------------------------------
 activemq-bootstrap/pom.xml                      | 23 ++++++
 .../apache/activemq/integration/FileBroker.java | 27 ++++++-
 .../apache/activemq/test/FileBrokerTest.java    | 84 ++++++++++++++++++++
 .../resources/activemq-configuration-nojms.xml  | 73 +++++++++++++++++
 .../test/resources/activemq-configuration.xml   | 77 ++++++++++++++++++
 5 files changed, 282 insertions(+), 2 deletions(-)
----------------------------------------------------------------------