Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
src/java/org/apache/cassandra/db/Memtable.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254cd85a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254cd85a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254cd85a
Branch: refs/heads/trunk
Commit: 254cd85a5b89a944a1c6251ff0846cbf03d52bfd
Parents: bd32104 5acc7a9
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Tue Nov 4 14:33:44 2014 -0600
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Tue Nov 4 14:33:44 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/AtomicBTreeColumns.java | 9 ++++++---
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 +++-
src/java/org/apache/cassandra/db/Memtable.java | 9 +++++----
.../org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 3 +++
src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java | 3 +++
5 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 7a98cb9,372ce5c..ec9bb94
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@@ -35,10 -35,8 +35,10 @@@ import org.apache.cassandra.config.CFMe
import org.apache.cassandra.db.composites.CellName;
import org.apache.cassandra.db.composites.Composite;
import org.apache.cassandra.db.filter.ColumnSlice;
- import org.apache.cassandra.utils.ObjectSizes;
+ import org.apache.cassandra.utils.*;
+import org.apache.cassandra.utils.SearchIterator;
import org.apache.cassandra.utils.btree.BTree;
+import org.apache.cassandra.utils.btree.BTreeSearchIterator;
import org.apache.cassandra.utils.btree.UpdateFunction;
import org.apache.cassandra.utils.concurrent.Locks;
import org.apache.cassandra.utils.concurrent.OpOrder;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 80376f7,ba3864f..21a36b8
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -43,8 -42,8 +43,7 @@@ import org.apache.cassandra.dht.LongTok
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.io.util.DiskAwareRunnable;
import org.apache.cassandra.service.ActiveRepairService;
- import org.apache.cassandra.utils.ByteBufferUtil;
- import org.apache.cassandra.utils.ObjectSizes;
++import org.apache.cassandra.utils.*;
import org.apache.cassandra.utils.concurrent.OpOrder;
import org.apache.cassandra.utils.memory.*;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------
