Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 CCB1117384 for ; Wed, 27 May 2015 02:12:29 +0000 (UTC) Received: (qmail 35385 invoked by uid 500); 27 May 2015 02:12:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 35312 invoked by uid 500); 27 May 2015 02:12:21 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 35235 invoked by uid 99); 27 May 2015 02:12:21 -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, 27 May 2015 02:12:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BCD9E0A4E; Wed, 27 May 2015 02:12:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Wed, 27 May 2015 02:12:27 -0000 Message-Id: In-Reply-To: <15c2eeed180c4ab4a35bda39ea94a70a@git.apache.org> References: <15c2eeed180c4ab4a35bda39ea94a70a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/650f1f9f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/650f1f9f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/650f1f9f Branch: refs/heads/master Commit: 650f1f9fefc092aa904bb98491d3373da4e5ce76 Parents: 342b6b3 caef59e Author: Josh Elser Authored: Tue May 26 22:12:09 2015 -0400 Committer: Josh Elser Committed: Tue May 26 22:12:09 2015 -0400 ---------------------------------------------------------------------- .../accumulo/server/replication/ReplicationUtil.java | 5 +++++ .../apache/accumulo/master/replication/WorkMaker.java | 5 +++++ .../org/apache/accumulo/tracer/AsyncSpanReceiver.java | 11 ++++++++--- .../tserver/replication/AccumuloReplicaSystem.java | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/650f1f9f/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java ----------------------------------------------------------------------