You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/04/01 20:34:14 UTC
[5/9] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
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/d3f6f943
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3f6f943
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3f6f943
Branch: refs/heads/cassandra-3.5
Commit: d3f6f9438f21019a0c499047489048d3d0aee7b8
Parents: 1a1f836 0ac2072
Author: Jason Brown <ja...@gmail.com>
Authored: Fri Apr 1 11:30:50 2016 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Apr 1 11:31:23 2016 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3f6f943/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0ce75a8,28903c5..8305852
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,10 +1,24 @@@
-2.2.6
+3.0.5
+ * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
+ * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
+ * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * 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:
+ * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
* Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
* Add cassandra-stress keystore option (CASSANDRA-9325)
- * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
- * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
* cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3f6f943/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------