You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/01/22 19:06:28 UTC

[1/3] cassandra git commit: Bump 2.2 version to 2.2.5 in build.xml

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.3 94604ceda -> acb7fed1d


Bump 2.2 version to 2.2.5 in build.xml


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

Branch: refs/heads/cassandra-3.3
Commit: b4d67c9e5db9aaff349354fbd285d434b6db296f
Parents: 3b244a3
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Jan 22 12:00:32 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jan 22 12:00:32 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d67c9e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 72ceb65..e5fefed 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="2.2.4"/>
+    <property name="base.version" value="2.2.5"/>
     <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/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.3
Commit: 2f8e5f34642790f2e75573a4fc4e4e43d49b52e4
Parents: 0b05203 b4d67c9
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Jan 22 12:01:23 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jan 22 12:01:23 2016 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: acb7fed1dc4a7429008d4b619222d1934ea9539a
Parents: 94604ce 2f8e5f3
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Jan 22 12:01:52 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Jan 22 12:01:52 2016 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------