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 D9E79180C2 for ; Thu, 31 Dec 2015 01:56:56 +0000 (UTC) Received: (qmail 70571 invoked by uid 500); 31 Dec 2015 01:56:56 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70506 invoked by uid 500); 31 Dec 2015 01:56:56 -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 70373 invoked by uid 99); 31 Dec 2015 01:56:56 -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; Thu, 31 Dec 2015 01:56:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E60CE0451; Thu, 31 Dec 2015 01:56:56 +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: Thu, 31 Dec 2015 01:56:59 -0000 Message-Id: In-Reply-To: <360387025da54d139a3651a639e6c932@git.apache.org> References: <360387025da54d139a3651a639e6c932@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/3cb1e7c0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3cb1e7c0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3cb1e7c0 Branch: refs/heads/master Commit: 3cb1e7c0269ec5e22cc81ae96146334194e1575d Parents: e4ccbbf 401350f Author: Josh Elser Authored: Wed Dec 30 20:56:16 2015 -0500 Committer: Josh Elser Committed: Wed Dec 30 20:56:16 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------