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 54E3710CB8 for ; Fri, 20 Sep 2013 16:22:43 +0000 (UTC) Received: (qmail 32264 invoked by uid 500); 20 Sep 2013 16:22:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 32138 invoked by uid 500); 20 Sep 2013 16:22:31 -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 31918 invoked by uid 99); 20 Sep 2013 16:22:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 16:22:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3BA8B8AF04F; Fri, 20 Sep 2013 16:22:24 +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: Fri, 20 Sep 2013 16:22:25 -0000 Message-Id: <97167b53f1144256a52e8ac2e3efedf5@git.apache.org> In-Reply-To: <99ecbea5ca044ad19d821e5ebaca450f@git.apache.org> References: <99ecbea5ca044ad19d821e5ebaca450f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80b21b8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80b21b8d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80b21b8d Branch: refs/heads/master Commit: 80b21b8d5938a45cd50eaddfc9549bdae70d02e4 Parents: 964b6f6 49aa56b Author: Eric Newton Authored: Fri Sep 20 12:22:25 2013 -0400 Committer: Eric Newton Committed: Fri Sep 20 12:22:25 2013 -0400 ---------------------------------------------------------------------- core/pom.xml | 15 ++ .../org/apache/accumulo/core/conf/Property.java | 3 +- .../apache/accumulo/core/util/shell/Shell.java | 51 +++-- .../core/util/shell/ShellOptionsJC.java | 14 ++ .../core/util/shell/ShellSetInstanceTest.java | 221 +++++++++++++++++++ .../chapters/table_design.tex | 8 +- .../server/tabletserver/TabletServer.java | 3 +- 7 files changed, 294 insertions(+), 21 deletions(-) ----------------------------------------------------------------------