Merge branch '1.9.x'
Conflicts:
ReleaseInstructions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/205680ef
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/205680ef
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/205680ef
Branch: refs/heads/master
Commit: 205680efd1937a2066d4484f759f4f7b2684db65
Parents: 530e59d ceb90ef
Author: Stefan Bodewig <[email protected]>
Authored: Thu Feb 2 20:15:17 2017 +0100
Committer: Stefan Bodewig <[email protected]>
Committed: Thu Feb 2 20:15:17 2017 +0100
----------------------------------------------------------------------
ReleaseInstructions | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/205680ef/ReleaseInstructions
----------------------------------------------------------------------
diff --cc ReleaseInstructions
index 6cd3627,27d4c41..7a752fc
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@@ -87,8 -86,7 +87,7 @@@ Note: This document was adapted from th
8. Commit your changes, tag them, push them.
- $ git tag -s -m "Tagging RC1 for version 1.9.7 of Ant" ANT_197_RC1
+ $ git tag -s -m "Tagging RC1 for version 1.10.0 of Ant" ANT_1.10.0_RC1
- $ git push
$ git push --tags
9. Ensure that the GPG key you use is inside the KEYS file in Ant's
