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/6fad4b09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fad4b09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fad4b09 Branch: refs/heads/trunk Commit: 6fad4b09fb9bfd58b3acdb6fc1f9f28543229d80 Parents: 63393eb 3faf88c Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Aug 1 15:47:50 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Aug 1 15:47:50 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fad4b09/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fad4b09/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------