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 94DBF1890A for ; Tue, 28 Jul 2015 19:45:42 +0000 (UTC) Received: (qmail 60078 invoked by uid 500); 28 Jul 2015 19:45:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 59995 invoked by uid 500); 28 Jul 2015 19:45:42 -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 59584 invoked by uid 99); 28 Jul 2015 19:45:42 -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; Tue, 28 Jul 2015 19:45:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EBFECE35DB; Tue, 28 Jul 2015 19:45:41 +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, 28 Jul 2015 19:45:49 -0000 Message-Id: <47bad622a1ab462d9f2eb504a7291a15@git.apache.org> In-Reply-To: <4d91f1d4f4814e39b84b2255f1a4078a@git.apache.org> References: <4d91f1d4f4814e39b84b2255f1a4078a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/12] accumulo git commit: Merge branch '1.5' into 1.6 Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/48ad87a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/48ad87a8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/48ad87a8 Branch: refs/heads/1.6 Commit: 48ad87a8122b9c4291f69e05ece187a39765c82e Parents: eefcaa0 262decd Author: Josh Elser Authored: Tue Jul 28 15:44:07 2015 -0400 Committer: Josh Elser Committed: Tue Jul 28 15:44:07 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------