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 215AC174AA for ; Fri, 22 May 2015 01:40:05 +0000 (UTC) Received: (qmail 19405 invoked by uid 500); 22 May 2015 01:40:05 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19362 invoked by uid 500); 22 May 2015 01:40:05 -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 19343 invoked by uid 99); 22 May 2015 01:40:05 -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; Fri, 22 May 2015 01:40:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7784E51CB; Fri, 22 May 2015 01:40:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 22 May 2015 01:40:07 -0000 Message-Id: In-Reply-To: <35ec8b4b86854fb7aa70d20b61cd91ed@git.apache.org> References: <35ec8b4b86854fb7aa70d20b61cd91ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/747da5a9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/747da5a9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/747da5a9 Branch: refs/heads/master Commit: 747da5a9ac01f36a207cd0b0305aeaeedccbae54 Parents: acd8a63 b4f6e5e Author: Josh Elser Authored: Thu May 21 21:39:36 2015 -0400 Committer: Josh Elser Committed: Thu May 21 21:39:36 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------