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 D86411057A for ; Wed, 11 Sep 2013 21:00:36 +0000 (UTC) Received: (qmail 59461 invoked by uid 500); 11 Sep 2013 21:00:36 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 59414 invoked by uid 500); 11 Sep 2013 21:00:36 -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 59343 invoked by uid 99); 11 Sep 2013 21:00:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 21:00:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8E1E48BE787; Wed, 11 Sep 2013 21:00:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Wed, 11 Sep 2013 21:00:37 -0000 Message-Id: In-Reply-To: <022e0edab5d24ec79103acdd9e19bc71@git.apache.org> References: <022e0edab5d24ec79103acdd9e19bc71@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f9efaf19 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f9efaf19 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f9efaf19 Branch: refs/heads/1.5.1-SNAPSHOT Commit: f9efaf19f4e5d7da345fdc1b906fec1e4ec59248 Parents: 4b98fac 789c920 Author: Eric Newton Authored: Wed Sep 11 17:00:46 2013 -0400 Committer: Eric Newton Committed: Wed Sep 11 17:00:46 2013 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/master/Master.java | 1 + .../org/apache/accumulo/server/tabletserver/TabletServer.java | 1 + start/src/main/java/org/apache/accumulo/start/Main.java | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------