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/449e0371 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/449e0371 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/449e0371 Branch: refs/heads/trunk Commit: 449e037195c3c504d7aca5088e8bc7bd5a50e7d0 Parents: 25565b6 aa75168 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Feb 27 22:54:55 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Feb 27 22:54:55 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/449e0371/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
