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 2015/07/06 18:26:49 UTC
[4/5] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
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/ff74eaf0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff74eaf0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff74eaf0
Branch: refs/heads/trunk
Commit: ff74eaf0e05b9dfecfb9f04850791114da2b3cf4
Parents: 269059e db39257
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Jul 6 12:26:01 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jul 6 12:26:01 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
...assandra-driver-internal-only-2.6.0c2.post.zip | Bin 0 -> 198346 bytes
lib/cassandra-driver-internal-only-2.6.0c2.zip | Bin 199328 -> 0 bytes
3 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff74eaf0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9973bbc,95dc8be..7c6b4ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,7 +1,28 @@@
-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)