Merge branch 'cassandra-2.0' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6bf9dcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6bf9dcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6bf9dcc

Branch: refs/heads/trunk
Commit: c6bf9dcc8e1147e80621fa09c6d23b1a2ae91d30
Parents: cb349d9 9806b77
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Mon Aug 12 19:19:56 2013 +0200
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Mon Aug 12 19:19:56 2013 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/CFMetaData.java | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


Reply via email to