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/1e237d5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e237d5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e237d5a
Branch: refs/heads/cassandra-2.2
Commit: 1e237d5a884687805a007410a15328c5ba97cc24
Parents: 5892732 c65d81b
Author: T Jake Luciani <j...@apache.org>
Authored: Tue Jun 30 09:28:02 2015 -0400
Committer: T Jake Luciani <j...@apache.org>
Committed: Tue Jun 30 09:28:02 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
lib/cassandra-driver-internal-only-2.6.0c1.zip | Bin 198898 -> 0 bytes
lib/cassandra-driver-internal-only-2.6.0c2.zip | Bin 0 -> 199328 bytes
3 files changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e237d5a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fe71ea7,052ced1..fc3c4c8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
-2.1.8
+2.2
+ * 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)
+Merged from 2.1:
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
* Avoids ballot clash in Paxos (CASSANDRA-9649)
* Fix IndexOutOfBoundsException when inserting tuple with too many
elements using the string literal notation (CASSANDRA-9559)
