Merge branch 'cassandra-1.0' into cassandra-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81e609d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81e609d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81e609d3 Branch: refs/heads/cassandra-1.1 Commit: 81e609d3f099650448656259fa34ab36cd5f2119 Parents: 75fdb85 46689e5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Mar 27 12:29:46 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Mar 27 12:29:46 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e609d3/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------