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 DE91910131 for ; Sat, 4 Jan 2014 03:06:38 +0000 (UTC) Received: (qmail 43909 invoked by uid 500); 4 Jan 2014 03:06:35 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 43823 invoked by uid 500); 4 Jan 2014 03:06:35 -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 43805 invoked by uid 99); 4 Jan 2014 03:06:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jan 2014 03:06:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EE0D0820A46; Sat, 4 Jan 2014 03:06:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Sat, 04 Jan 2014 03:06:33 -0000 Message-Id: <1850335ca3544e19a498e430e8238016@git.apache.org> In-Reply-To: <1a7d1a6de92f4b4db68f1afb29111d2c@git.apache.org> References: <1a7d1a6de92f4b4db68f1afb29111d2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de79c0c8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de79c0c8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de79c0c8 Branch: refs/heads/master Commit: de79c0c8958aa08f89479b419e673f0cb6e15c90 Parents: 1bfa738 764884e Author: Christopher Tubbs Authored: Fri Jan 3 22:01:53 2014 -0500 Committer: Christopher Tubbs Committed: Fri Jan 3 22:01:53 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/Constants.java | 2 - .../core/client/admin/TableOperations.java | 2 +- .../accumulo/core/client/impl/Namespaces.java | 41 ++++ .../accumulo/core/client/impl/Tables.java | 74 ++++++- .../client/mock/MockNamespaceOperations.java | 4 +- .../core/client/mock/MockTableOperations.java | 3 +- .../accumulo/core/util/ArgumentChecker.java | 33 +++ .../util/shell/commands/CreateTableCommand.java | 4 +- .../server/client/ClientServiceHandler.java | 10 +- .../accumulo/master/FateServiceHandler.java | 215 +++++++++---------- .../master/MasterClientServiceHandler.java | 4 +- .../org/apache/accumulo/test/NamespacesIT.java | 37 ++-- 12 files changed, 285 insertions(+), 144 deletions(-) ----------------------------------------------------------------------