Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
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/65a4f5dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65a4f5dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65a4f5dc
Branch: refs/heads/trunk
Commit: 65a4f5dc728f2785256ab1a94e9428a662eff145
Parents: ee62ae1 a5cc16d
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Jul 29 19:27:33 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Jul 29 19:27:33 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
