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/e79cd74d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e79cd74d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e79cd74d Branch: refs/heads/trunk Commit: e79cd74d711043204f07d9395408f6d35aaaf4cf Parents: 0ac8c66 4adfd5c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Oct 23 23:50:17 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Oct 23 23:50:17 2013 +0800 ---------------------------------------------------------------------- NEWS.txt | 2 ++ src/java/org/apache/cassandra/config/CFMetaData.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e79cd74d/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e79cd74d/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
