Updated Branches: refs/heads/cassandra-1.2 99b3963b7 -> 3925f5606 refs/heads/trunk 59af0b9c4 -> 7242a0054
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/7242a005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7242a005 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7242a005 Branch: refs/heads/trunk Commit: 7242a0054d6d2499f621d6b128bdc39e7ec97f5c Parents: 59af0b9 3925f56 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Feb 13 22:56:49 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Feb 13 22:56:49 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7242a005/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7242a005/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
