Merge branch '2.1' into 2.2

This commit is contained in:
mark_story 2012-05-22 21:27:05 -04:00
commit d6bf61cb36

View file

@ -180,7 +180,7 @@
<echo msg="Creating new release commit" /> <echo msg="Creating new release commit" />
<exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" /> <exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" />
<exec command="git commit -m 'Update version number to ${release_version}'" logoutput="true" checkreturn="true" /> <exec command="git commit -m 'Update version number to ${release_version}'" logoutput="true" checkreturn="true" />
<exec command="git tag -a ${release_version} -m 'CakePHP ${release_version}'" logoutput="true" checkreturn="true" /> <exec command="git tag -s ${release_version} -m 'CakePHP ${release_version}'" logoutput="true" checkreturn="true" />
<propertyprompt propertyName="shipit" defaultValue="n" promptText="Ship the new commit and tag?" /> <propertyprompt propertyName="shipit" defaultValue="n" promptText="Ship the new commit and tag?" />
<condition property="noshipit" value="1"> <condition property="noshipit" value="1">