Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1daa8e4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1daa8e4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1daa8e4f Branch: refs/heads/trunk Commit: 1daa8e4fdf6cf2fdcb5accbb03dd08ba61b22a19 Parents: 0b23599 42be16f Author: Jason Brown <[email protected]> Authored: Wed Jun 19 10:19:02 2013 -0700 Committer: Jason Brown <[email protected]> Committed: Wed Jun 19 10:19:02 2013 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/EndpointState.java | 5 +++++ src/java/org/apache/cassandra/gms/HeartBeatState.java | 5 +++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daa8e4f/src/java/org/apache/cassandra/gms/EndpointState.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1daa8e4f/src/java/org/apache/cassandra/gms/HeartBeatState.java ----------------------------------------------------------------------
