Updated Branches: refs/heads/trunk 1c507e5f9 -> d82814ae4
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/d82814ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d82814ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d82814ae Branch: refs/heads/trunk Commit: d82814ae4960cb7966137578f12902c5ea8b279c Parents: 1c507e5 d079c82 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Feb 28 11:19:49 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Feb 28 11:19:49 2012 +0100 ---------------------------------------------------------------------- .../cassandra/service/RangeSliceVerbHandler.java | 1 - .../apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d82814ae/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d82814ae/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
