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/b743eabd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b743eabd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b743eabd Branch: refs/heads/trunk Commit: b743eabd7a12603b8e6a56cd818355560e5c0cf4 Parents: 3648549 dac984f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Aug 23 01:05:47 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Aug 23 01:05:47 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b743eabd/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
