Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3aa72157 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3aa72157 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3aa72157 Branch: refs/heads/trunk Commit: 3aa721577986e44950533cf1024bab17251b0ae4 Parents: 3ca9576 c489a4e Author: Aleksey Yeschenko <[email protected]> Authored: Sat Aug 23 18:28:39 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sat Aug 23 18:28:39 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aa72157/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
