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 6685010898 for ; Tue, 23 Dec 2014 00:30:54 +0000 (UTC) Received: (qmail 15872 invoked by uid 500); 23 Dec 2014 00:30:54 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 15766 invoked by uid 500); 23 Dec 2014 00:30:54 -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 15603 invoked by uid 99); 23 Dec 2014 00:30:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Dec 2014 00:30:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC568A33F79; Tue, 23 Dec 2014 00:30:53 +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: Tue, 23 Dec 2014 00:30:56 -0000 Message-Id: <9ece8f4d5db246e6b0132267a181f0dc@git.apache.org> In-Reply-To: <995675d8788a4b1a99056e39dfbfc228@git.apache.org> References: <995675d8788a4b1a99056e39dfbfc228@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] accumulo git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c019c1c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c019c1c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c019c1c Branch: refs/heads/master Commit: 9c019c1cb9882f1418d637ce364a4e0ce699cb19 Parents: 8719485 9255120 Author: Josh Elser Authored: Mon Dec 22 19:30:34 2014 -0500 Committer: Josh Elser Committed: Mon Dec 22 19:30:34 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------