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/02/27 11:42:42 UTC
[5/5] activemq-6 git commit: Merge PR #121
Merge PR #121
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/a895bf33
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/a895bf33
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/a895bf33
Branch: refs/heads/master
Commit: a895bf3344a78e10148d375756e39a676bfdd592
Parents: ba1e685 b1c8ff3
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Feb 27 10:42:18 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Feb 27 10:42:18 2015 +0000
----------------------------------------------------------------------
.../core/persistence/StorageManager.java | 9 +-
.../impl/journal/BatchingIDGenerator.java | 65 +++++++++++-
.../impl/journal/JournalStorageManager.java | 18 ++++
.../impl/nullpm/NullStorageManager.java | 6 ++
.../tests/logging/AssertionLoggerHandler.java | 23 +++--
.../activemq/tests/util/ServiceTestBase.java | 55 +++++++---
docs/user-manual/en/configuring-transports.md | 17 ---
docs/user-manual/en/jms-bridge.md | 4 +
docs/user-manual/en/paging.md | 12 ++-
.../integration/client/HangConsumerTest.java | 68 +++++++-----
.../integration/server/SimpleStartStopTest.java | 103 +++++++++++++++++++
.../impl/BatchIDGeneratorUnitTest.java | 16 ++-
12 files changed, 323 insertions(+), 73 deletions(-)
----------------------------------------------------------------------