Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b42afc42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b42afc42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b42afc42 Branch: refs/heads/trunk Commit: b42afc424a6e12d8d7ae5b7cf44e139379ac6514 Parents: c000da1 02a12fa Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 18 18:05:07 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 18 18:05:07 2015 +0000 ---------------------------------------------------------------------- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b42afc42/build.xml ---------------------------------------------------------------------- diff --cc build.xml index b20ee71,e6c3217..d574e32 --- a/build.xml +++ b/build.xml @@@ -25,7 -25,7 +25,7 @@@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="3.0.0-rc1"/> - <property name="base.version" value="3.1"/> ++ <property name="base.version" value="3.2"/> <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
