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 B704910F77 for ; Wed, 18 Dec 2013 14:53:45 +0000 (UTC) Received: (qmail 58337 invoked by uid 500); 18 Dec 2013 14:53:36 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58291 invoked by uid 500); 18 Dec 2013 14:53: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 58111 invoked by uid 99); 18 Dec 2013 14:53:32 -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, 18 Dec 2013 14:53:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0882C8C38; Wed, 18 Dec 2013 14:53:32 +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, 18 Dec 2013 14:53:41 -0000 Message-Id: In-Reply-To: <687d1301506841f8a6e0e7b7a23e4f37@git.apache.org> References: <687d1301506841f8a6e0e7b7a23e4f37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/13] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 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/3ec25dbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ec25dbe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ec25dbe Branch: refs/heads/1.6.0-SNAPSHOT Commit: 3ec25dbe5e9a70fd8ce2ebeecc0627d06cae1e2b Parents: 5bb28ed 2d97b87 Author: Eric Newton Authored: Wed Dec 18 09:50:17 2013 -0500 Committer: Eric Newton Committed: Wed Dec 18 09:50:17 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/data/Key.java | 13 ++ .../org/apache/accumulo/core/data/Mutation.java | 7 + .../org/apache/accumulo/core/data/KeyTest.java | 30 +++- .../apache/accumulo/core/data/MutationTest.java | 143 ++++++++++++------- .../apache/accumulo/core/data/OldMutation.java | 7 + 5 files changed, 143 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ec25dbe/core/src/main/java/org/apache/accumulo/core/data/Mutation.java ----------------------------------------------------------------------