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 B337B17C88 for ; Mon, 23 Mar 2015 22:44:06 +0000 (UTC) Received: (qmail 98181 invoked by uid 500); 23 Mar 2015 22:44:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 98075 invoked by uid 500); 23 Mar 2015 22:44:06 -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 98000 invoked by uid 99); 23 Mar 2015 22:44:06 -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; Mon, 23 Mar 2015 22:44:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72AE6E1834; Mon, 23 Mar 2015 22:44:06 +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: Mon, 23 Mar 2015 22:44:08 -0000 Message-Id: <51f63c15a1e64856aa1b19cdb0ae318a@git.apache.org> In-Reply-To: <73be0fbfbb90431b84482b8ba7066214@git.apache.org> References: <73be0fbfbb90431b84482b8ba7066214@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/bbf5b7c3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bbf5b7c3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bbf5b7c3 Branch: refs/heads/master Commit: bbf5b7c3ee3ffa4eb2383fd9a6ec902dbecb0b49 Parents: a1439e3 85942da Author: Josh Elser Authored: Mon Mar 23 18:35:53 2015 -0400 Committer: Josh Elser Committed: Mon Mar 23 18:35:53 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------