Updated Branches: refs/heads/cassandra-1.2 265964064 -> 828572acd refs/heads/trunk c6204b595 -> e9777087f
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9777087 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9777087 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9777087 Branch: refs/heads/trunk Commit: e9777087fa2244e98c5dbf9681e558ec404a9e85 Parents: c6204b5 828572a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Feb 13 17:01:14 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Feb 13 17:01:14 2013 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9777087/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
