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 2B77110622 for ; Mon, 30 Dec 2013 19:11:34 +0000 (UTC) Received: (qmail 97396 invoked by uid 500); 30 Dec 2013 19:10:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 97019 invoked by uid 500); 30 Dec 2013 19:09:55 -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 96993 invoked by uid 99); 30 Dec 2013 19:09:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Dec 2013 19:09:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 00FE688CD56; Mon, 30 Dec 2013 19:09:52 +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: Mon, 30 Dec 2013 19:09:58 -0000 Message-Id: <99c72a0e782d4cf89ca39722818be3cb@git.apache.org> In-Reply-To: <122313e481d6456580bda73f405bc2fb@git.apache.org> References: <122313e481d6456580bda73f405bc2fb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/15] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Merge branch '1.4.5-SNAPSHOT' 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/20cc9f4e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20cc9f4e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20cc9f4e Branch: refs/heads/1.6.0-SNAPSHOT Commit: 20cc9f4ececea4c8fe5053deb42667e426e19084 Parents: 5510685 f56ae10 Author: Eric Newton Authored: Mon Dec 30 13:16:05 2013 -0500 Committer: Eric Newton Committed: Mon Dec 30 13:16:05 2013 -0500 ---------------------------------------------------------------------- server/src/main/java/org/apache/accumulo/server/master/Master.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------