Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37b3a2ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37b3a2ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37b3a2ba Branch: refs/heads/trunk Commit: 37b3a2ba0fa0a5127e4599113609eb84a2b44240 Parents: c0fc698 6fad4b0 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Fri Aug 1 21:50:21 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Fri Aug 1 21:50:21 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
