Merge branch 'cassandra-2.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/938e6989 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/938e6989 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/938e6989 Branch: refs/heads/trunk Commit: 938e6989a6f12a4cd68e6f0e7980b2687dd701e1 Parents: 455e673 424206a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 24 10:29:23 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 24 10:29:23 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 20 ++++++++++++++++---- .../apache/cassandra/service/StorageProxy.java | 3 ++- .../org/apache/cassandra/tools/NodeCmd.java | 7 +++++++ 4 files changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/938e6989/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/938e6989/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/938e6989/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
