Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6acbb33f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6acbb33f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6acbb33f
Branch: refs/heads/trunk
Commit: 6acbb33fa4191e60d5e9cdd58f815dea7c2ff616
Parents: 072b488 c3550fe
Author: Aleksey Yeschenko <[email protected]>
Authored: Thu Apr 24 02:03:16 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Thu Apr 24 02:03:16 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
