Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d462c04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d462c04
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d462c04
Branch: refs/heads/trunk
Commit: 2d462c04973a15e84ca550ce3913d08d7c5ee8c8
Parents: 1eda7cb 0ef1888
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Jul 17 15:36:24 2015 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Jul 17 15:36:24 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d462c04/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 49cc850,f20fad8..c6774c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,7 +1,32 @@@
-2.0.17
+2.1.9
+ * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
- * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
+ * Handle corrupt files on startup (CASSANDRA-9686)
+ * Fix clientutil jar and tests (CASSANDRA-9760)
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
+Merged from 2.0:
+ * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Don't include auth credentials in debug log (CASSANDRA-9682)
* Can't transition from write survey to normal mode (CASSANDRA-9740)
+ * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Fix growing pending background compaction (CASSANDRA-9662)
+
+
+2.1.8
+ * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
+ COMPACT STORAGE tables with no clustering columns
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * Eliminate strong self-reference chains in sstable ref tidiers
(CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances
(CASSANDRA-9700)
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage
(CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction
(CASSANDRA-9637)
+Merged from 2.0:
* Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
