cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Thu, 23 Jul 2015 15:28:05 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: d9dfbddbeefa6f5591b8609d4cd796e77d010a0c
Parents: c912668 51ff499
Author: Yuki Morishita <yukim@apache.org>
Authored: Thu Jul 23 10:27:43 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Thu Jul 23 10:27:43 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/db/BatchlogManager.java        | 4 +++-
 .../apache/cassandra/service/BatchlogEndpointFilterTest.java | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dfbddb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 67566fb,b8593c0..d405a4d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,8 -1,8 +24,9 @@@
  2.2.1
   * UDF / UDA execution time in trace (CASSANDRA-9723)
   * Remove repair snapshot leftover on startup (CASSANDRA-7357)
+  * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
  
 +
  2.2.0
   * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
   * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dfbddb/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dfbddb/test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
index 186cc41,3a19b75..be33e3f
--- a/test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
+++ b/test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
@@@ -20,11 -20,13 +20,12 @@@ package org.apache.cassandra.service
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.Collection;
+ import java.util.HashSet;
  
 -import org.junit.Test;
 -import org.junit.matchers.JUnitMatchers;
 -
  import com.google.common.collect.ImmutableMultimap;
  import com.google.common.collect.Multimap;
 +import org.junit.Test;
 +import org.junit.matchers.JUnitMatchers;
  
  import org.apache.cassandra.db.BatchlogManager;
  


Mime
View raw message