cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 28 Oct 2015 15:14:20 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9be01e34c8adaa9558458e864969d22b05cb8e87
Parents: 30d5b65 4d00468
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 28 16:14:10 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 28 16:14:10 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 .../apache/cassandra/thrift/CassandraServer.java   | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9be01e34/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5f3abbe,3423a1e..04cefae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * 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.0
+  * Fix thrift get() queries with defined columns (CASSANDRA-10586)
   * Fix marking of indexes as built and removed (CASSANDRA-10601)
   * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595)
   * Fix batches on multiple tables (CASSANDRA-10554)


Mime
View raw message