Return-Path: 
 <commits-return-12618-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
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 6D52E11DB8
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed, 13 Aug 2014 01:35:45 +0000 (UTC)
Received: (qmail 56404 invoked by uid 500); 13 Aug 2014 01:35:45 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 56334 invoked by uid 500); 13 Aug 2014 01:35:45 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 56227 invoked by uid 99); 13 Aug 2014 01:35:45 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2014 01:35:45 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id CEBE2990E3E; Wed, 13 Aug 2014 01:35:44 +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: Wed, 13 Aug 2014 01:35:51 -0000
Message-Id: <5db0b1f754df45c6bf19fa6ef81be49e@git.apache.org>
In-Reply-To: <124e45b81a9242d2ad52351863fbe19e@git.apache.org>
References: <124e45b81a9242d2ad52351863fbe19e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [8/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ee78d99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ee78d99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ee78d99

Branch: refs/heads/master
Commit: 3ee78d994d51ad342bcaf260f1f87284dd0bba0e
Parents: e440e47 c4d46bb
Author: Josh Elser <elserj@apache.org>
Authored: Tue Aug 12 21:32:26 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Aug 12 21:32:26 2014 -0400

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ee78d99/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0d75f10,2f14d07..ca99168
--- a/pom.xml
+++ b/pom.xml
@@@ -605,13 -481,15 +605,15 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-release-plugin</artifactId>
+           <!-- Work around MRELEASE-812 -->
+           <version>2.5</version>
            <configuration>
 -            <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
 +            <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
              <autoVersionSubmodules>true</autoVersionSubmodules>
 -            <goals>clean compile javadoc:aggregate deploy</goals>
 -            <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
 +            <goals>clean deploy</goals>
 +            <preparationGoals>clean verify</preparationGoals>
              <tagNameFormat>@{project.version}</tagNameFormat>
 -            <releaseProfiles>seal-jars</releaseProfiles>
 +            <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
              <useReleaseProfile>false</useReleaseProfile>
              <pushChanges>false</pushChanges>
              <localCheckout>true</localCheckout>