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 744FE10C78 for ; Tue, 12 Nov 2013 22:39:07 +0000 (UTC) Received: (qmail 94460 invoked by uid 500); 12 Nov 2013 22:39:07 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 94364 invoked by uid 500); 12 Nov 2013 22:39:07 -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 94346 invoked by uid 99); 12 Nov 2013 22:39:07 -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, 12 Nov 2013 22:39:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1B8A78239F4; Tue, 12 Nov 2013 22:39:07 +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, 12 Nov 2013 22:39:08 -0000 Message-Id: <94674ff50c494308a20d65d53c499a35@git.apache.org> In-Reply-To: <5406966dbf3d4f179da9f615962e5bb9@git.apache.org> References: <5406966dbf3d4f179da9f615962e5bb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ed74a2e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ed74a2e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ed74a2e Branch: refs/heads/1.6.0-SNAPSHOT Commit: 1ed74a2efe9d635337b457df78861d45fcc35922 Parents: 48128c0 c93872a Author: Josh Elser Authored: Tue Nov 12 13:54:59 2013 -0800 Committer: Josh Elser Committed: Tue Nov 12 13:54:59 2013 -0800 ---------------------------------------------------------------------- pom.xml | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ed74a2e/pom.xml ----------------------------------------------------------------------