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 2013/05/06 01:43:21 UTC
[1/2] git commit: Update thrift-generated Constants.java
Updated Branches:
refs/heads/trunk 5b0ec50cc -> 2c124606f
Update thrift-generated Constants.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0637b867
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0637b867
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0637b867
Branch: refs/heads/trunk
Commit: 0637b86749b8fcd52f421d53adcaafefdcd01266
Parents: 68da4b4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon May 6 02:40:44 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon May 6 02:40:44 2013 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/thrift/Constants.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0637b867/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
index 8721462..d8ab801 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
@@ -44,6 +44,6 @@ import org.slf4j.LoggerFactory;
public class Constants {
- public static final String VERSION = "19.35.0";
+ public static final String VERSION = "19.36.0";
}
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Conflicts:
interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c124606
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c124606
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c124606
Branch: refs/heads/trunk
Commit: 2c124606fb6504f6d82c0597f526a93c290930c3
Parents: 5b0ec50 0637b86
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon May 6 02:42:52 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon May 6 02:42:52 2013 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------