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 2B409187AC for ; Wed, 28 Oct 2015 15:16:22 +0000 (UTC) Received: (qmail 13596 invoked by uid 500); 28 Oct 2015 15:16:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13493 invoked by uid 500); 28 Oct 2015 15:16:22 -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 13404 invoked by uid 99); 28 Oct 2015 15:16:22 -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, 28 Oct 2015 15:16:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7A40E03CD; Wed, 28 Oct 2015 15:16:21 +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, 28 Oct 2015 15:16:24 -0000 Message-Id: In-Reply-To: References: 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/3ae43364 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ae43364 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ae43364 Branch: refs/heads/master Commit: 3ae43364b3472c194e003dcb81b95ecca87aa70d Parents: dfa734f 1619ae4 Author: Josh Elser Authored: Wed Oct 28 11:15:58 2015 -0400 Committer: Josh Elser Committed: Wed Oct 28 11:15:58 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------