Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 4f778d2e7 -> 824ffa1da refs/heads/cassandra-2.1.0 a09e53cda -> 110a132b1 refs/heads/trunk 37b3a2ba0 -> ff4d159ef
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f778d2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f778d2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f778d2e Branch: refs/heads/trunk Commit: 4f778d2e7ec469f2b2afcdd1b5f5e8012fe6b9bd Parents: 24f6f03 3faf88c Author: Benedict Elliott Smith <[email protected]> Authored: Fri Aug 1 21:51:01 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Aug 1 21:51:01 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
