cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Date Mon, 30 Nov 2015 12:37:03 GMT
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/4a4afa79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a4afa79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a4afa79

Branch: refs/heads/trunk
Commit: 4a4afa79c43586fcbda93458d65b59cfab654ae0
Parents: 306d882 5de5d06
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Mon Nov 30 12:28:38 2015 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Mon Nov 30 12:28:38 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 14 +++--
 .../org/apache/cassandra/config/Schema.java     |  8 +--
 .../apache/cassandra/cql3/QueryProcessor.java   |  4 +-
 .../cassandra/service/MigrationListener.java    |  4 +-
 .../cassandra/service/MigrationManager.java     |  4 +-
 .../org/apache/cassandra/transport/Server.java  |  2 +-
 .../validation/entities/SecondaryIndexTest.java | 62 +++++++++++++-------
 .../index/internal/CassandraIndexTest.java      |  8 ---
 9 files changed, 62 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a4afa79/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c5d7b9,57769db..c69cdf5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,19 @@@
 +3.2
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.1
  Merged from 3.0:
+  * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
   * Fix SELECT statement with IN restrictions on partition key,
     ORDER BY and LIMIT (CASSANDRA-10729)
   * Improve stress performance over 1k threads (CASSANDRA-7217)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a4afa79/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
----------------------------------------------------------------------


Mime
View raw message