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 429EB1885E for ; Wed, 27 Jan 2016 23:02:17 +0000 (UTC) Received: (qmail 82513 invoked by uid 500); 27 Jan 2016 23:02:17 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 82454 invoked by uid 500); 27 Jan 2016 23:02:17 -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 82292 invoked by uid 99); 27 Jan 2016 23:02:17 -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, 27 Jan 2016 23:02:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E23FDE0209; Wed, 27 Jan 2016 23:02:16 +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: Wed, 27 Jan 2016 23:02:20 -0000 Message-Id: <82cc80fc9f1445059173c1022e6763a3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/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/0faf8b9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0faf8b9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0faf8b9c Branch: refs/heads/1.7 Commit: 0faf8b9c0619bdb203be704c7a09547a884fd58b Parents: bd9969f ff1e003 Author: Christopher Tubbs Authored: Wed Jan 27 18:01:32 2016 -0500 Committer: Christopher Tubbs Committed: Wed Jan 27 18:01:32 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------