You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/12/11 10:32:42 UTC

[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

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/4d6fdaae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d6fdaae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d6fdaae

Branch: refs/heads/trunk
Commit: 4d6fdaae907baff03cdbd8e3a152b41c74787e64
Parents: 6f5e835 37ca86b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 11 10:32:32 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 11 10:32:32 2015 +0100

----------------------------------------------------------------------
 .../cassandra/service/StorageService.java       | 40 +++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------