You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/05/02 20:57:27 UTC

[4/6] git commit: merge from 2.1

merge from 2.1


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

Branch: refs/heads/trunk
Commit: 3089c92d4eb71a906a40879eeefd61b8cc903b12
Parents: a811dd0 62af7d0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 2 13:57:13 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 2 13:57:13 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/locator/SnitchProperties.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3089c92d/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------