Merge branch 'cassandra-3.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/989c3aa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/989c3aa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/989c3aa8 Branch: refs/heads/trunk Commit: 989c3aa8204a4cf4e142ba029c9b23e18dc6fd24 Parents: 4146853 39ee040 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Aug 6 18:12:29 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Aug 6 18:12:29 2015 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 1 - src/java/org/apache/cassandra/net/MessagingService.java | 8 ++------ src/java/org/apache/cassandra/service/StorageService.java | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/989c3aa8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
