cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/2] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2
Date Wed, 21 Oct 2015 08:13:18 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/ccb738f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb738f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb738f8

Branch: refs/heads/cassandra-2.2
Commit: ccb738f8d333965d1b80d2b41606421d37d5f4e3
Parents: 98be5de 86583af
Author: blerer <benjamin.lerer@datastax.com>
Authored: Wed Oct 21 10:12:13 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Wed Oct 21 10:12:43 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb738f8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 458d0d5,6734f75..4f5e8a7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,15 -8,10 +12,16 @@@ Merged from 2.1
   * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
   * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
   * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+  * Fix sorting for queries with an IN condition on partition key columns (CASSANDRA-10363)
  
  
 -2.1.11
 +2.2.3
 + * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
 + * Preserve case of quoted Role & User names (CASSANDRA-10394)
 + * cqlsh pg-style-strings broken (CASSANDRA-10484)
 + * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 +Merged from 2.1:
   * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)


Mime
View raw message