Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c6b7569 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c6b7569 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c6b7569 Branch: refs/heads/trunk Commit: 1c6b75698bd55961b84c22c122f15ea3b6f2e404 Parents: dcf89bf 81e609d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Mar 27 12:30:17 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Mar 27 12:30:17 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/1c6b7569/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
