Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3036218C19 for ; Wed, 25 Nov 2015 11:28:18 +0000 (UTC) Received: (qmail 40110 invoked by uid 500); 25 Nov 2015 11:28:18 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 40025 invoked by uid 500); 25 Nov 2015 11:28:18 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 40007 invoked by uid 99); 25 Nov 2015 11:28:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Nov 2015 11:28:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE9FFE03E8; Wed, 25 Nov 2015 11:28:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: martyntaylor@apache.org To: commits@activemq.apache.org Date: Wed, 25 Nov 2015 11:28:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] activemq-artemis git commit: Merge #251 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 Authored: Wed Nov 25 11:26:58 2015 +0000 Committer: Martyn Taylor 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(-) ----------------------------------------------------------------------