cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [5/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 18 Mar 2016 09:52:55 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.5
Commit: 1dbfa4b5430726ff0f5598e845498acd9083dea0
Parents: e8651b6 01d8636
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Mar 18 10:52:00 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Mar 18 10:52:00 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dbfa4b5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 51cfc16,ee58fed..a077551
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.2.6
 +3.0.5
 + * Support streaming pre-3.0 sstables (CASSANDRA-10990)
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
 + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
   * Clarify that now() function is calculated on the coordinator node in CQL documentation
(CASSANDRA-10900)
   * Fix bloom filter sizing with LCS (CASSANDRA-11344)
   * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dbfa4b5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message