You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/05/15 18:50:34 UTC
[1/2] cassandra git commit: beta1 version
Repository: cassandra
Updated Branches:
refs/heads/trunk b6d27332f -> a558a9a16
beta1 version
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94480b1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94480b1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94480b1f
Branch: refs/heads/trunk
Commit: 94480b1f4f81c0e4adece8908a83ea0104db85c8
Parents: 1689e0a
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri May 15 12:49:11 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri May 15 12:49:46 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 +-
build.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94480b1f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d670571..08e1005 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2.2
+2.2.0-beta1
* Use ecj instead of javassist for UDFs
* faster async logback configuration for tests (CASSANDRA-9376)
* Add `smallint` and `tinyint` data types (CASSANDRA-8951)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94480b1f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 700c66c..f3dab3f 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.0"/>
+ <property name="base.version" value="2.2.0-beta1"/>
<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-2.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a558a9a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a558a9a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a558a9a1
Branch: refs/heads/trunk
Commit: a558a9a1677e2897384e03f43ad8e13002078f68
Parents: b6d2733 94480b1
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri May 15 12:50:21 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri May 15 12:50:21 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------