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 052ED18845 for ; Mon, 19 Oct 2015 14:48:59 +0000 (UTC) Received: (qmail 19231 invoked by uid 500); 19 Oct 2015 14:48:58 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19130 invoked by uid 500); 19 Oct 2015 14:48:58 -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 19046 invoked by uid 99); 19 Oct 2015 14:48:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Oct 2015 14:48:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C877E0286; Mon, 19 Oct 2015 14:48:58 +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, 19 Oct 2015 14:48:59 -0000 Message-Id: <4c4970fe155e4637a7750826b27ae656@git.apache.org> In-Reply-To: <7a26b360a6e74940a65e16b3a1ceded4@git.apache.org> References: <7a26b360a6e74940a65e16b3a1ceded4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52ba24e3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52ba24e3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52ba24e3 Branch: refs/heads/master Commit: 52ba24e32a4559d5ae36874d15da7c72fb799da3 Parents: a801383 1f28ee7 Author: Eric C. Newton Authored: Mon Oct 19 10:48:07 2015 -0400 Committer: Eric C. Newton Committed: Mon Oct 19 10:48:07 2015 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 2 +- core/src/test/java/org/apache/accumulo/core/data/MutationTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------