Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24bdd00d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24bdd00d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24bdd00d Branch: refs/heads/trunk Commit: 24bdd00dacab22ee1abaefef873e9039ca0b1f5d Parents: 2042bc3 36f54f9 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Dec 1 18:59:48 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Dec 1 18:59:48 2013 +0300 ---------------------------------------------------------------------- .../apache/cassandra/net/MessagingService.java | 29 -------------------- .../cassandra/service/StorageService.java | 2 -- 2 files changed, 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24bdd00d/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24bdd00d/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
