Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/130b8656 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/130b8656 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/130b8656 Branch: refs/heads/cassandra-1.1 Commit: 130b8656b5c598fe8b5350b03ab77ada42fecb08 Parents: 59a3630 527d590 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 21 13:36:11 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 21 13:36:11 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Schema.java | 9 +++++++++ src/java/org/apache/cassandra/db/DefsTable.java | 2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 4 ++-- .../apache/cassandra/service/MigrationManager.java | 1 + .../apache/cassandra/service/StorageService.java | 6 +++--- 5 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/130b8656/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------