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 C168517C48 for ; Tue, 17 Mar 2015 19:46:08 +0000 (UTC) Received: (qmail 53791 invoked by uid 500); 17 Mar 2015 19:46:08 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 53686 invoked by uid 500); 17 Mar 2015 19:46:08 -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 53668 invoked by uid 99); 17 Mar 2015 19:46:08 -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; Tue, 17 Mar 2015 19:46:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86CD0E1806; Tue, 17 Mar 2015 19:46:08 +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: Tue, 17 Mar 2015 19:46:12 -0000 Message-Id: <4c877f5f06a74898a7f3e1dc944746bb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.5' into 1.6 Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/16a7bb43 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16a7bb43 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/16a7bb43 Branch: refs/heads/1.6 Commit: 16a7bb43717ae42cc70ceda33eeee452539fb1ba Parents: 1ea9010 83ee1c1 Author: Christopher Tubbs Authored: Tue Mar 17 15:40:27 2015 -0400 Committer: Christopher Tubbs Committed: Tue Mar 17 15:40:27 2015 -0400 ---------------------------------------------------------------------- .../accumulo/core/util/shell/commands/DeleteScanIterCommand.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------