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 8E91418142 for ; Fri, 12 Feb 2016 22:46:23 +0000 (UTC) Received: (qmail 8511 invoked by uid 500); 12 Feb 2016 22:46:23 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 8442 invoked by uid 500); 12 Feb 2016 22:46:23 -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 8307 invoked by uid 99); 12 Feb 2016 22:46:23 -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, 12 Feb 2016 22:46:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31185E6994; Fri, 12 Feb 2016 22:46:23 +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: Fri, 12 Feb 2016 22:46:28 -0000 Message-Id: <144dce3ba4f44cc78aefd45d6d4d966b@git.apache.org> In-Reply-To: <117eb88e4bc74b2bbac4fb47f2a41f9a@git.apache.org> References: <117eb88e4bc74b2bbac4fb47f2a41f9a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c023a3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c023a3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c023a3c Branch: refs/heads/master Commit: 3c023a3c8972c9da00e451f79d01595af5b8edc5 Parents: a6e6e67 c283f4a Author: Christopher Tubbs Authored: Fri Feb 12 17:45:49 2016 -0500 Committer: Christopher Tubbs Committed: Fri Feb 12 17:45:49 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------