You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/18 19:05:26 UTC

[1/2] cassandra git commit: Set base.version to 3.1

Repository: cassandra
Updated Branches:
  refs/heads/trunk c000da135 -> b42afc424


Set base.version to 3.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02a12fa1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02a12fa1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02a12fa1

Branch: refs/heads/trunk
Commit: 02a12fa1e901257a16a4e677d3c2d4c86ffa3575
Parents: b0f159c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Nov 18 18:04:13 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Nov 18 18:04:13 2015 +0000

----------------------------------------------------------------------
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02a12fa1/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 577506e..e6c3217 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="3.0.0"/>
+    <property name="base.version" value="3.1"/>
     <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"/>


[2/2] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

Posted by al...@apache.org.
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 <al...@apache.org>
Authored: Wed Nov 18 18:05:07 2015 +0000
Committer: Aleksey Yeschenko <al...@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"/>