cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 05 May 2014 07:28:24 GMT
Merge branch 'cassandra-2.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/ddd2ff7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddd2ff7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddd2ff7d

Branch: refs/heads/trunk
Commit: ddd2ff7d63c9a9977eb2dd25936cecbb2ecd1cfb
Parents: f3945bc 3aa41fb
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon May 5 09:28:12 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon May 5 09:28:12 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +
 interface/cassandra.thrift                      |   3 +-
 .../org/apache/cassandra/config/CFMetaData.java | 108 +++++++++----------
 .../cassandra/config/ColumnDefinition.java      |  34 +++---
 .../org/apache/cassandra/db/SuperColumns.java   |   5 +-
 .../composites/CompoundDenseCellNameType.java   |   8 +-
 .../cassandra/thrift/CassandraServer.java       |  14 ++-
 .../cassandra/config/ColumnDefinitionTest.java  |   2 +-
 8 files changed, 92 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bc6db0d,2f55eee..f587a55
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,15 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 +
  2.1.0-rc1
   * Parallel streaming for sstableloader (CASSANDRA-3668)
+  * Fix bugs in supercolumns handling (CASSANDRA-7138)
+  * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
  Merged from 2.0:
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/interface/cassandra.thrift
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------


Mime
View raw message