Merge #251
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/686e645c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/686e645c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/686e645c Branch: refs/heads/master Commit: 686e645c3af73cb8b385c3653ab32bcdfad7c657 Parents: db04192 00cac50 Author: Martyn Taylor <mtay...@redhat.com> Authored: Wed Nov 25 11:26:58 2015 +0000 Committer: Martyn Taylor <mtay...@redhat.com> Committed: Wed Nov 25 11:26:58 2015 +0000 ---------------------------------------------------------------------- .../api/core/JGroupsBroadcastEndpoint.java | 26 ++++++----- .../artemis/core/config/ConfigurationUtils.java | 30 ++++++++---- .../core/server/ActiveMQMessageBundle.java | 3 ++ .../config/impl/HAPolicyConfigurationTest.java | 48 ++++++++++++++++++++ .../colocated-hapolicy-config-null-backup.xml | 42 +++++++++++++++++ .../colocated-hapolicy-config2-null-backup.xml | 37 +++++++++++++++ 6 files changed, 167 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
