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/a7684c7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7684c7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7684c7b Branch: refs/heads/trunk Commit: a7684c7b120ad9a423361cd467a1bf82bee4162c Parents: c9a19cb 5e35d87 Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 14:19:33 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 14:19:33 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/gms/Gossiper.java.orig | 1275 ------------------ 1 file changed, 1275 deletions(-) ----------------------------------------------------------------------
