cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [3/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 31 Aug 2015 09:08:38 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c870adc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c870adc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c870adc2

Branch: refs/heads/cassandra-3.0
Commit: c870adc2f7c3281c36f96625127fe03e29fa83c4
Parents: f2b6616 8a8a5a4
Author: Robert Stupp <snazy@snazy.de>
Authored: Mon Aug 31 11:06:17 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Mon Aug 31 11:06:17 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c870adc2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7090dcd,7841f9b..37244c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,10 +1,29 @@@
 -2.1.10
 +2.2.2
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
++Merged from 2.1:
+  * Only check KeyCache when it is enabled
 - * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
 - * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
  
  
 -2.1.9
 +2.2.1
 + * Fix race during construction of commit log (CASSANDRA-10049)
 + * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
 + * Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
 + * (cqlsh) add CLEAR command (CASSANDRA-10086)
 + * Support string literals as Role names for compatibility (CASSANDRA-10135)
 + * Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
 + * An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
 + * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
 + * Fix histogram overflow exception (CASSANDRA-9973)
 + * Route gossip messages over dedicated socket (CASSANDRA-9237)
 + * Add checksum to saved cache files (CASSANDRA-9265)
 + * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Fix broken internode SSL (CASSANDRA-9884)
 +Merged from 2.1:
 + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
 + * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
   * Avoid race condition during read repair (CASSANDRA-9460)
   * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
   * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)


Mime
View raw message