Merge branch '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/21123cca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21123cca Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/21123cca Branch: refs/heads/master Commit: 21123cca72a576c237e17b2a95b0105202265d45 Parents: 6471355 642add8 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jan 11 19:59:51 2016 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jan 11 19:59:51 2016 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/21123cca/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 3f90af2,3fc5d96..e7bb0f6 --- a/pom.xml +++ b/pom.xml @@@ -689,8 -654,8 +689,8 @@@ <autoVersionSubmodules>true</autoVersionSubmodules> <goals>clean deploy</goals> <preparationGoals>clean verify</preparationGoals> - <tagNameFormat>@{project.version}</tagNameFormat> + <tagNameFormat>rel/@{project.version}</tagNameFormat> - <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles> + <releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles> <useReleaseProfile>false</useReleaseProfile> <pushChanges>false</pushChanges> <localCheckout>true</localCheckout>