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/9b9aaaa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b9aaaa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b9aaaa8 Branch: refs/heads/cassandra-1.0 Commit: 9b9aaaa8a822b5cf4a8fddf9280bfcb24aa6749f Parents: c3237e4 1176d9f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 8 17:43:55 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 8 17:43:55 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- src/java/org/apache/cassandra/db/Table.java | 2 +- .../apache/cassandra/service/StorageService.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
