cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Fri, 22 Jan 2016 14:52:05 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: 8ab41c8d0aa12e8565d49e8a9712bb3bd5238de7
Parents: 3b014d0 a60a80b
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jan 22 15:51:24 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jan 22 15:51:24 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../cql3/statements/SelectStatement.java        | 22 ++++++----
 .../operations/SelectOrderByTest.java           | 43 ++++++++++++++++++++
 3 files changed, 60 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ab41c8d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index afaf114,f49e8d4..8a41b2e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,7 -11,19 +15,9 @@@ Merged from 3.0
     tombstone (CASSANDRA-10743)
   * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
   * Fix potential assertion error during compaction (CASSANDRA-10944)
 - * Fix counting of received sstables in streaming (CASSANDRA-10949)
 - * Implement hints compression (CASSANDRA-9428)
 - * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 - * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 - * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 - * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 - * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
 - * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 - * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
 - * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
  Merged from 2.2:
+ 2.2.5
+  * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
   * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
     going (CASSANDRA-10979)
   * Make UUID LSB unique per process (CASSANDRA-7925)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ab41c8d/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------


Mime
View raw message