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/fc4ae115 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc4ae115 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc4ae115 Branch: refs/heads/trunk Commit: fc4ae115ac94b1599d308956590672eaca49e64d Parents: 6e97178 b69f5e3 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Apr 15 15:23:12 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Apr 15 15:23:12 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 6 ++++++ src/java/org/apache/cassandra/config/KSMetaData.java | 1 + 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc4ae115/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc4ae115/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
