You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/05/04 15:18:49 UTC
[2/2] activemq-artemis git commit: This closes #1251
This closes #1251
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/94f721e8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/94f721e8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/94f721e8
Branch: refs/heads/1.x
Commit: 94f721e88beb5613c579cf020dd040b7de327338
Parents: 468b8a9 88e629a
Author: Justin Bertram <jb...@apache.org>
Authored: Thu May 4 10:08:00 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu May 4 10:08:00 2017 -0500
----------------------------------------------------------------------
.../config/ActiveMQDefaultConfiguration.java | 10 ++
.../artemis/core/config/ConfigurationUtils.java | 2 +-
.../SharedStoreMasterPolicyConfiguration.java | 10 ++
.../deployers/impl/FileConfigurationParser.java | 1 +
.../core/server/ActiveMQServerLogger.java | 9 +-
.../core/server/cluster/ha/HAPolicy.java | 5 +
.../cluster/ha/SharedStoreMasterPolicy.java | 13 ++-
.../cluster/ha/SharedStoreSlavePolicy.java | 8 +-
.../core/server/impl/ActiveMQServerImpl.java | 38 ++++---
.../impl/SharedNothingBackupActivation.java | 2 +-
.../impl/SharedStoreBackupActivation.java | 2 +-
.../server/impl/SharedStoreLiveActivation.java | 4 +
.../resources/schema/artemis-configuration.xsd | 7 ++
.../impl/FileConfigurationParserTest.java | 20 ++++
docs/user-manual/en/ha.md | 6 ++
.../SharedStoreDontWaitForActivationTest.java | 104 +++++++++++++++++++
16 files changed, 217 insertions(+), 24 deletions(-)
----------------------------------------------------------------------