Merge branch '1.5' into 1.6
Conflicts:
core/src/main/scripts/generate-thrift.sh
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f852e2e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f852e2e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f852e2e
Branch: refs/heads/1.6
Commit: 8f852e2efcd93304105eb15915c8f50d7fb5f49f
Parents: 52a6e97 1f8b668
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Dec 18 15:50:35 2014 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Dec 18 15:50:35 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f852e2e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0d3323f,8316a33..ec55ebe
--- a/pom.xml
+++ b/pom.xml
@@@ -609,12 -484,12 +609,12 @@@
<!-- Work around MRELEASE-812 -->
<version>2.5</version>
<configuration>
- <arguments>-P apache-release,thrift,assemble,docs,sunny
-Dtimeout.factor=2</arguments>
- <arguments>-Dmavanagaiata.dirtyFlag=false -P
apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
++ <arguments>-P apache-release,thrift,assemble,docs,sunny
-Dtimeout.factor=2 -Dmavanagaiata.dirtyFlag=false</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>
