Updated Branches: refs/heads/cassandra-1.2 edcc7f137 -> 275fae9cf refs/heads/cassandra-1.2.0 c4cca2d8b -> 309666b4d refs/heads/trunk 60027c4cc -> db555f7f0
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db555f7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db555f7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db555f7f Branch: refs/heads/trunk Commit: db555f7f0bf56326318339db2d784a96b5a3160d Parents: 60027c4 275fae9 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Nov 15 11:00:59 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Nov 15 11:00:59 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/db555f7f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db555f7f/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
