Merge branch '1.6' into 1.7
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/642add8c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/642add8c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/642add8c
Branch: refs/heads/master
Commit: 642add8cc6710ec5e396bd9e690e058ed8fe1837
Parents: 78659a6 567f52f
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Mon Jan 11 19:57:51 2016 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Mon Jan 11 19:57:51 2016 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/642add8c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0fa003a,de8302c..3fc5d96
--- a/pom.xml
+++ b/pom.xml
@@@ -654,8 -625,8 +654,8 @@@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
- <tagNameFormat>@{project.version}</tagNameFormat>
+ <tagNameFormat>rel/@{project.version}</tagNameFormat>
-
<releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
+
<releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
