Updated Branches: refs/heads/cassandra-1.2 dcddfaf5e -> bc575ae28 refs/heads/trunk 631bc37a6 -> 64f8dfbd2
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/64f8dfbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64f8dfbd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64f8dfbd Branch: refs/heads/trunk Commit: 64f8dfbd20f7cbb3a44e458913d34a2e5f362d29 Parents: 631bc37 bc575ae Author: Brandon Williams <[email protected]> Authored: Tue Jan 15 11:09:35 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 15 11:09:35 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/64f8dfbd/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
