From commits-return-50959-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Tue Apr 3 22:22:59 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6E0AA18064D for ; Tue, 3 Apr 2018 22:22:58 +0200 (CEST) Received: (qmail 7028 invoked by uid 500); 3 Apr 2018 20:22:57 -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 7019 invoked by uid 99); 3 Apr 2018 20:22:57 -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; Tue, 03 Apr 2018 20:22:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 749F1DFF7E; Tue, 3 Apr 2018 20:22:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 03 Apr 2018 20:22:57 -0000 Message-Id: <377a6da26c494b11a7530e810c2702e8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] activemq-artemis git commit: This closes #1984 Repository: activemq-artemis Updated Branches: refs/heads/master 650c79ee0 -> a8e81f226 This closes #1984 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a8e81f22 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a8e81f22 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a8e81f22 Branch: refs/heads/master Commit: a8e81f2267d3428ba101e9c3d899838c75d40ce1 Parents: 650c79e f3e1ab3 Author: Clebert Suconic Authored: Tue Apr 3 16:22:13 2018 -0400 Committer: Clebert Suconic Committed: Tue Apr 3 16:22:13 2018 -0400 ---------------------------------------------------------------------- .../core/server/cluster/impl/BridgeImpl.java | 38 ++++++++++++-------- .../cluster/impl/ClusterConnectionBridge.java | 19 +++++++--- .../cluster/failover/BackupSyncJournalTest.java | 35 ++++++++++++++++-- 3 files changed, 71 insertions(+), 21 deletions(-) ----------------------------------------------------------------------