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/975df2ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/975df2ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/975df2ed Branch: refs/heads/trunk Commit: 975df2edaf5f1fd56a2bff72b78c0e5d9f56ac20 Parents: 643f135 a2824e6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Sep 16 16:23:00 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Sep 16 16:23:00 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/MessagingService.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975df2ed/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975df2ed/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975df2ed/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
