cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 28 Oct 2015 13:24:23 GMT
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/69037275
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69037275
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69037275

Branch: refs/heads/cassandra-3.0
Commit: 69037275568d6fd753ee2ee40e7a5ac1751f459b
Parents: 13e9fd5 734a3bf
Author: Robert Stupp <snazy@snazy.de>
Authored: Wed Oct 28 14:20:02 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Wed Oct 28 14:20:02 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 NEWS.txt    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69037275/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 76b1a55,c4f606f..b4cc43b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,13 +1,20 @@@
 -2.2.4
 +3.0
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not requireAuthentication
(CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421)
-  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
 + * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
     and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Do STCS in DTCS windows (CASSANDRA-10276)
 - * Don't try to get ancestors from half-renamed sstables (CASSANDRA-10501)
   * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
   * Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550)
   * Fix paging issues with partitions containing only static columns data (CASSANDRA-10381)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69037275/NEWS.txt
----------------------------------------------------------------------


Mime
View raw message