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 Mon, 18 Jan 2016 14:27:48 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/bf917cbd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf917cbd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf917cbd

Branch: refs/heads/trunk
Commit: bf917cbd90bcaa5be8b76e857e58561a00a82c8d
Parents: a6170ef 2445ea7
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Jan 18 15:25:51 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Jan 18 15:25:51 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 .../org/apache/cassandra/service/StartupChecks.java     |  2 +-
 src/java/org/apache/cassandra/utils/SigarLibrary.java   |  9 ++++++++-
 src/java/org/apache/cassandra/utils/UUIDGen.java        | 12 ++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf917cbd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c7a5c23,41978ba..840c795
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -11,7 -7,18 +11,8 @@@ 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:
+  * Make UUID LSB unique per process (CASSANDRA-7925)
   * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
   * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
   * Fix error streaming section more than 2GB (CASSANDRA-10961)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf917cbd/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf917cbd/src/java/org/apache/cassandra/utils/UUIDGen.java
----------------------------------------------------------------------


Mime
View raw message