cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [12/15] git commit: merge from 1.2
Date Wed, 13 Aug 2014 15:23:35 GMT
merge from 1.2


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

Branch: refs/heads/cassandra-2.1.0
Commit: 5d663222379cea3b4c73ed37b953a537b594dd68
Parents: fe4c8c2 40deb91
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Aug 13 10:22:54 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Aug 13 10:22:54 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 src/java/org/apache/cassandra/utils/BiMultiValMap.java    | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57b0183,334feb5..b270f85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.0.10
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 +2.1.0-rc6
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 +Merged from 2.0:
++ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)
@@@ -140,6 -43,8 +141,7 @@@ Merged from 2.0
   * Track max/min timestamps for range tombstones (CASSANDRA-7647)
   * Fix NPE when listing saved caches dir (CASSANDRA-7632)
  Merged from 1.2:
 - * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+  * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
   * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
   * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message