You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/06/19 19:19:21 UTC
[1/2] git commit: ninja add toString() on gossip-related classes.
Updated Branches:
refs/heads/trunk 0b2359959 -> 1daa8e4fd
ninja add toString() on gossip-related classes.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42be16fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42be16fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42be16fc
Branch: refs/heads/trunk
Commit: 42be16fc87dab2b2530ddd581cad68820832f57b
Parents: f932aa2
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jun 19 10:17:51 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jun 19 10:17:51 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/42be16fc/src/java/org/apache/cassandra/gms/EndpointState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java b/src/java/org/apache/cassandra/gms/EndpointState.java
index 6cf7a06..997aec7 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -108,6 +108,11 @@ public class EndpointState
{
isAlive = false;
}
+
+ public String toString()
+ {
+ return "EndpointState: HeartBeatState = " + hbState + ", AppStateMap = " + applicationState;
+ }
}
class EndpointStateSerializer implements IVersionedSerializer<EndpointState>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42be16fc/src/java/org/apache/cassandra/gms/HeartBeatState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/HeartBeatState.java b/src/java/org/apache/cassandra/gms/HeartBeatState.java
index 269c4b4..6cbface 100644
--- a/src/java/org/apache/cassandra/gms/HeartBeatState.java
+++ b/src/java/org/apache/cassandra/gms/HeartBeatState.java
@@ -62,6 +62,11 @@ class HeartBeatState
{
generation += 1;
}
+
+ public String toString()
+ {
+ return String.format("HeartBeat: generation = %d, version = %d", generation, version);
+ }
}
class HeartBeatStateSerializer implements IVersionedSerializer<HeartBeatState>
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Wed Jun 19 10:19:02 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
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
----------------------------------------------------------------------