cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Sun, 01 Feb 2015 22:11:53 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/cassandra-2.1
Commit: 2a283e10f9183d9a0138e7622ca135cd3b001ac2
Parents: 9c38a10 2dd6944
Author: Yuki Morishita <yukim@apache.org>
Authored: Sun Feb 1 16:10:31 2015 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Sun Feb 1 16:10:31 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                    | 2 +-
 src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 129e1c9,9e9b772..40d844c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -90,7 -5,10 +90,7 @@@ Merged from 2.0
     (CASSANDRA-8619)
   * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
   * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
-  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
+  * Fix isClientMode check in Keyspace (CASSANDRA-8687)
 -
 -
 -2.0.12:
   * Use more efficient slice size for querying internal secondary
     index tables (CASSANDRA-8550)
   * Fix potentially returning deleted rows with range tombstone (CASSANDRA-8558)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index d27424e,38b7c2b..d92eea4
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -35,12 -30,8 +35,9 @@@ import com.google.common.collect.Iterab
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import org.apache.cassandra.config.CFMetaData;
- import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.config.KSMetaData;
- import org.apache.cassandra.config.Schema;
+ import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.commitlog.CommitLog;
 +import org.apache.cassandra.db.commitlog.ReplayPosition;
  import org.apache.cassandra.db.filter.QueryFilter;
  import org.apache.cassandra.db.index.SecondaryIndex;
  import org.apache.cassandra.db.index.SecondaryIndexManager;


Mime
View raw message