Merge branch 'cassandra-2.1' into cassandra-2.2
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/12ff1cda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12ff1cda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12ff1cda
Branch: refs/heads/trunk
Commit: 12ff1cda7027f76c9b649f674d1e99459164a3fe
Parents: 0f5dd22 30df089
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Tue Jul 7 15:49:00 2015 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Tue Jul 7 15:49:00 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
pylib/cqlshlib/sslhandling.py | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12ff1cda/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a863ad8,0fbadbc..864eed2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,14 +1,35 @@@
-2.1.9
+2.2.0-rc3
+Merged from 2.0:
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
-Merged from 2.0:
- * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
-2.1.8
+2.2.0-rc2
+ * Re-enable memory-mapped I/O on Windows (CASSANDRA-9658)
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * (cqlsh) Allow setting the initial connection timeout (CASSANDRA-9601)
+ * BulkLoader has --transport-factory option but does not use it
(CASSANDRA-9675)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Update cqlsh for UDFs (CASSANDRA-7556)
+ * Change Windows kernel default timer resolution (CASSANDRA-9634)
+ * Deprected sstable2json and json2sstable (CASSANDRA-9618)
+ * Allow native functions in user-defined aggregates (CASSANDRA-9542)
+ * Don't repair system_distributed by default (CASSANDRA-9621)
+ * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622)
+ * Rename class for DATE type in Java driver (CASSANDRA-9563)
+ * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
+ * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
+ * Mlockall before opening system sstables & remove boot_without_jna option
(CASSANDRA-9573)
+ * Add functions to convert timeuuid to date or time, deprecate dateOf and
unixTimestampOf (CASSANDRA-9229)
+ * Make sure we cancel non-compacting sstables from LifecycleTransaction
(CASSANDRA-9566)
+ * Fix deprecated repair JMX API (CASSANDRA-9570)
+ * Add logback metrics (CASSANDRA-9378)
+ * Update and refactor ant test/test-compression to run the tests in parallel
(CASSANDRA-9583)
+ * Fix upgrading to new directory for secondary index (CASSANDRA-9687)
+Merged from 2.1:
* (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)
