Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dac984f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dac984f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dac984f1 Branch: refs/heads/cassandra-2.1 Commit: dac984f14644f1b344e58cf7fe21892142ab95f1 Parents: e3a4fba 508db1e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Aug 23 01:04:37 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Aug 23 01:04:37 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
