Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9806b776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9806b776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9806b776 Branch: refs/heads/trunk Commit: 9806b7761fa035665959bc3a7434d535021c7d7d Parents: 839cc33 1716054 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Aug 12 19:19:24 2013 +0200 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Aug 12 19:19:24 2013 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
