Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
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/a5a72617
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5a72617
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5a72617
Branch: refs/heads/trunk
Commit: a5a726174ab3b574544950ba3cd75186461b797f
Parents: bef9526 6874aaa
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Mar 29 02:17:56 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Sat Mar 29 02:17:56 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
