Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/db/DataTracker.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/1e57bd15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e57bd15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e57bd15
Branch: refs/heads/trunk
Commit: 1e57bd1553e463c0440eab7bdedf860eecf04398
Parents: 6e6863d 47bbfe3
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Mar 29 00:43:37 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Sat Mar 29 00:43:37 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
