You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/05/03 20:40:23 UTC
[2/2] activemq-artemis git commit: This closes #1246
This closes #1246
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2d7dbc50
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2d7dbc50
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2d7dbc50
Branch: refs/heads/master
Commit: 2d7dbc501cfd7a7d50e3f2303729fd0a4d22ddf7
Parents: cdaae15 6017e30
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed May 3 16:40:16 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 3 16:40:16 2017 -0400
----------------------------------------------------------------------
.../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 | 19 ++++
docs/user-manual/en/ha.md | 6 ++
.../SharedStoreDontWaitForActivationTest.java | 104 +++++++++++++++++++
16 files changed, 216 insertions(+), 24 deletions(-)
----------------------------------------------------------------------