Commit b0f8dd89 authored by Benjamin Eberlei's avatar Benjamin Eberlei

Merge branch 'master' of github.com:doctrine/dbal

parents 0a1d8b83 91211fbb
......@@ -179,7 +179,6 @@
<target name="git-tag">
<exec command="grep '${version}' ${project.basedir}/lib/Doctrine/DBAL/Version.php" checkreturn="true"/>
<exec command="git tag -a ${version}" passthru="true" />
<exec command="git push origin ${version}" passthru="true" />
</target>
<target name="pirum-release">
......@@ -198,7 +197,6 @@
<exec command="mv ${project.basedir}/lib/Doctrine/DBAL/Version2.php ${project.basedir}/lib/Doctrine/DBAL/Version.php" passthru="true" />
<exec command="git add ${project.basedir}/lib/Doctrine/DBAL/Version.php" passthru="true" />
<exec command="git commit -m 'Bump Dev Version to ${next_version}'" passthru="true" />
<exec command="git push origin master" passthru="true" />
</target>
<target name="release" depends="git-tag,build-packages,distribute-download,pirum-release,update-dev-version" />
......
......@@ -36,7 +36,7 @@ class Version
/**
* Current Doctrine Version
*/
const VERSION = '2.1.0BETA2-DEV';
const VERSION = '2.1.0RC2-DEV';
/**
* Compares a Doctrine version with the current one.
......
Subproject commit 3103408ac394e8f9948431c0302a09faf352764e
Subproject commit 565674b9b376edbc5e31070e91fd85ea6dbd5d60
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment