Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/275fae9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/275fae9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/275fae9c Branch: refs/heads/cassandra-1.2 Commit: 275fae9cfe29bdc4f7a5218ff801ae209c7093d1 Parents: edcc7f1 309666b Author: Yuki Morishita <yu...@apache.org> Authored: Thu Nov 15 11:00:16 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Nov 15 11:00:16 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 1 + src/java/org/apache/cassandra/config/Schema.java | 1 + src/java/org/apache/cassandra/db/SystemTable.java | 7 ++ .../cassandra/service/AntiEntropyService.java | 7 ++- .../apache/cassandra/service/StorageService.java | 69 ++++++--------- 6 files changed, 42 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/275fae9c/CHANGES.txt ----------------------------------------------------------------------