Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9a19cbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9a19cbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9a19cbb Branch: refs/heads/trunk Commit: c9a19cbba13d4afc008ea1bc24fb455092430b28 Parents: b342371 7c05b89 Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 14:18:42 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 14:18:42 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/gms/Gossiper.java.orig | 1275 ++++++++++++++++++ .../org/apache/cassandra/tools/NodeTool.java | 2 +- 2 files changed, 1276 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a19cbb/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
