Merge branch 'cassandra-2.0' into cassandra-2.1
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/d38f677c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d38f677c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d38f677c
Branch: refs/heads/cassandra-2.1
Commit: d38f677c007a46f6fa914e7a3535bb12feb6ec94
Parents: 5e90091 9afc209
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Jun 17 18:01:23 2014 -0700
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Jun 17 18:01:23 2014 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
