Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc480c79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc480c79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc480c79 Branch: refs/heads/trunk Commit: dc480c794e8ca49e29ceff6405149273456c984d Parents: 30784fd e33d4be Author: Aleksey Yeschenko <[email protected]> Authored: Wed Mar 9 16:37:17 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Mar 9 16:37:35 2016 +0000 ---------------------------------------------------------------------- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc480c79/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 113b730,264a0be..5dc1e06 --- 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.4"/> - <property name="base.version" value="3.5"/> ++ <property name="base.version" value="3.6"/> <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"/>
