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 8C17A10D61 for ; Tue, 28 Jan 2014 22:57:27 +0000 (UTC) Received: (qmail 87568 invoked by uid 500); 28 Jan 2014 22:57:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87498 invoked by uid 500); 28 Jan 2014 22:57:20 -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 87380 invoked by uid 99); 28 Jan 2014 22:57:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jan 2014 22:57:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 498A490AF8D; Tue, 28 Jan 2014 22:57:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Tue, 28 Jan 2014 22:57:24 -0000 Message-Id: <7033dda295ec41a4b492ec75d669e500@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/550d8ac6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/550d8ac6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/550d8ac6 Branch: refs/heads/master Commit: 550d8ac654c33beffc72b08c6033a8602620b672 Parents: 07d7ece 07da9e3 Author: John Vines Authored: Tue Jan 28 17:56:23 2014 -0500 Committer: John Vines Committed: Tue Jan 28 17:56:23 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/tserver/TabletServer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------