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/7f4b5e30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f4b5e30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f4b5e30 Branch: refs/heads/cassandra-3.0 Commit: 7f4b5e3051ea1f314a517e6406e834efd4ee280b Parents: 99ea2ee 77ab773 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Apr 18 15:26:26 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Apr 18 15:26:26 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4b5e30/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c9538a8,baaf227..6586299 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,9 +1,14 @@@ -2.2.7 +3.0.6 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) - * Allow only DISTINCT queries with partition keys or static columns restrictions (CASSANDRA-11339) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + header is received (CASSANDRA-11464) + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) +Merged from 2.2: + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) - - -2.2.6 + * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4b5e30/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ----------------------------------------------------------------------
