Updated Branches: refs/heads/trunk 5f60deeef -> 2a16776cb
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a16776c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a16776c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a16776c Branch: refs/heads/trunk Commit: 2a16776cb4ad231b05e12f0f3805fd002df217aa Parents: 5f60dee 6e5722d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Sun Mar 4 11:17:26 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Sun Mar 4 11:17:26 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../apache/cassandra/service/StorageService.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a16776c/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
