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 C0C3717968 for ; Wed, 2 Sep 2015 03:28:42 +0000 (UTC) Received: (qmail 24824 invoked by uid 500); 2 Sep 2015 03:28:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 24727 invoked by uid 500); 2 Sep 2015 03:28:42 -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 23560 invoked by uid 99); 2 Sep 2015 03:28:40 -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; Wed, 02 Sep 2015 03:28:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3226E1785; Wed, 2 Sep 2015 03:28:39 +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: Wed, 02 Sep 2015 03:28:53 -0000 Message-Id: <9e493d99858c47d4b8d689292a246fe0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/19] 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/07ac4c85 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07ac4c85 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07ac4c85 Branch: refs/heads/1.7 Commit: 07ac4c85f30e57d094df8c1b481fe02b3237d2a7 Parents: c767e1d c6aae57 Author: Josh Elser Authored: Tue Sep 1 23:27:36 2015 -0400 Committer: Josh Elser Committed: Tue Sep 1 23:27:36 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------