Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/813da2ad Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/813da2ad Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/813da2ad Branch: refs/heads/master Commit: 813da2ad3e50beafd0defebe24cf0b9b1f3c4d0d Parents: e0ab351 3f1cec6 Author: Stefan Bodewig <[email protected]> Authored: Sat Mar 24 13:54:46 2018 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Sat Mar 24 13:54:46 2018 +0100 ---------------------------------------------------------------------- ReleaseInstructions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/813da2ad/ReleaseInstructions ---------------------------------------------------------------------- diff --cc ReleaseInstructions index 615640f,762450f..f9f1c19 --- a/ReleaseInstructions +++ b/ReleaseInstructions @@@ -38,12 -37,12 +38,12 @@@ Note: This document was adapted from th the build with -verbose option and scan for lines beginning with "Unable to load...". - 3. We don't want tags for failed votes to end up on out branches so + 3. We don't want tags for failed votes to end up on our branches so the release is first created from a detached head. - Checkout the HEAD of the 1.9.x branch as a detached head: + Checkout the HEAD of the master branch as a detached head: - $ git checkout 1.9.x^0 + $ git checkout master^0 4. Make sure that your directory tree is clean by running git status. Some tests leave behind leftovers which end up in the source
