Updated Branches: refs/heads/cassandra-1.2 4154434cf -> 12948f652 refs/heads/cassandra-1.2.0 a90b310e6 -> 7322f8238 refs/heads/trunk 7fdd4ccbd -> fa9c54ef6
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/fa9c54ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa9c54ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa9c54ef Branch: refs/heads/trunk Commit: fa9c54ef6e57a2a7bfe78f09063b2a922ff3cd9e Parents: 7fdd4cc 12948f6 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Dec 6 08:25:55 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Dec 6 08:25:55 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 4 +- src/java/org/apache/cassandra/db/SystemTable.java | 26 ++++++++++++-- .../apache/cassandra/service/StorageService.java | 4 ++- 3 files changed, 27 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa9c54ef/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa9c54ef/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
