Merge branch 'cassandra-2.2' into cassandra-3.0

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d479b8d6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d479b8d6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d479b8d6

Branch: refs/heads/cassandra-3.0
Commit: d479b8d68ee69fa1b2b2cce79d186e7f93e4f197
Parents: 5e722ee 97dbc7a
Author: Marcus Eriksson <marc...@apache.org>
Authored: Wed Mar 23 14:40:39 2016 +0100
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Wed Mar 23 14:40:39 2016 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d479b8d6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

Reply via email to