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/12948f65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12948f65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12948f65 Branch: refs/heads/cassandra-1.2 Commit: 12948f652623e47aac5e64e28815c0e787a0bd88 Parents: 4154434 7322f82 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Dec 6 08:25:43 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Dec 6 08:25:43 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(-) ----------------------------------------------------------------------
