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 2017/08/29 15:26:56 UTC
[01/12] cassandra git commit: followup to CASSANDRA-13700;
minor cleanup
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 a3498d5eb -> 6b927783b
refs/heads/cassandra-2.2 c6dec2f0e -> 4b52a6860
refs/heads/cassandra-3.11 826ae9c91 -> 35dc3b652
refs/heads/trunk 278906c6c -> 6e395dd3b
followup to CASSANDRA-13700; minor cleanup
Patch by jasobrown; reviewed by Joel Knighton for CASSANDRA-13700
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b927783
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b927783
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b927783
Branch: refs/heads/cassandra-2.1
Commit: 6b927783ba0777d3dd7c2c3311b246a8dbce5b59
Parents: a3498d5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:52:40 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 07:52:40 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b927783/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 7c37917..d3db37f 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -860,8 +860,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* than the version passed in. In this case we also send the old
* heart beat and throw it away on the receiver if it is redundant.
*/
- int localHbGeneration = epState.getHeartBeatState().getGeneration();
- int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion();
+ HeartBeatState heartBeatState = epState.getHeartBeatState();
+ int localHbGeneration = heartBeatState.getGeneration();
+ int localHbVersion = heartBeatState.getHeartBeatVersion();
if (localHbVersion > version)
{
reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[03/12] cassandra git commit: followup to CASSANDRA-13700;
minor cleanup
Posted by ja...@apache.org.
followup to CASSANDRA-13700; minor cleanup
Patch by jasobrown; reviewed by Joel Knighton for CASSANDRA-13700
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b927783
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b927783
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b927783
Branch: refs/heads/cassandra-3.11
Commit: 6b927783ba0777d3dd7c2c3311b246a8dbce5b59
Parents: a3498d5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:52:40 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 07:52:40 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b927783/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 7c37917..d3db37f 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -860,8 +860,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* than the version passed in. In this case we also send the old
* heart beat and throw it away on the receiver if it is redundant.
*/
- int localHbGeneration = epState.getHeartBeatState().getGeneration();
- int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion();
+ HeartBeatState heartBeatState = epState.getHeartBeatState();
+ int localHbGeneration = heartBeatState.getGeneration();
+ int localHbVersion = heartBeatState.getHeartBeatVersion();
if (localHbVersion > version)
{
reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[05/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b52a686
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b52a686
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b52a686
Branch: refs/heads/cassandra-3.11
Commit: 4b52a6860488280073c5b107d9e7ae824a327fd9
Parents: c6dec2f 6b92778
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:58:38 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:00:34 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b52a686/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[11/12] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35dc3b65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35dc3b65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35dc3b65
Branch: refs/heads/trunk
Commit: 35dc3b652f0ba94ff9977035efe9074174f9c69c
Parents: 826ae9c 82d6840
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 08:22:16 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:23:50 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35dc3b65/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[04/12] cassandra git commit: followup to CASSANDRA-13700;
minor cleanup
Posted by ja...@apache.org.
followup to CASSANDRA-13700; minor cleanup
Patch by jasobrown; reviewed by Joel Knighton for CASSANDRA-13700
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b927783
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b927783
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b927783
Branch: refs/heads/trunk
Commit: 6b927783ba0777d3dd7c2c3311b246a8dbce5b59
Parents: a3498d5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:52:40 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 07:52:40 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b927783/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 7c37917..d3db37f 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -860,8 +860,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* than the version passed in. In this case we also send the old
* heart beat and throw it away on the receiver if it is redundant.
*/
- int localHbGeneration = epState.getHeartBeatState().getGeneration();
- int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion();
+ HeartBeatState heartBeatState = epState.getHeartBeatState();
+ int localHbGeneration = heartBeatState.getGeneration();
+ int localHbVersion = heartBeatState.getHeartBeatVersion();
if (localHbVersion > version)
{
reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d68408
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d68408
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d68408
Branch: refs/heads/trunk
Commit: 82d684080dac7e1aac61b41395dc5dd84acfda60
Parents: cf0b6d1 4b52a68
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 08:01:00 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:02:29 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d68408/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[06/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b52a686
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b52a686
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b52a686
Branch: refs/heads/cassandra-2.2
Commit: 4b52a6860488280073c5b107d9e7ae824a327fd9
Parents: c6dec2f 6b92778
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:58:38 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:00:34 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b52a686/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b52a686
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b52a686
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b52a686
Branch: refs/heads/trunk
Commit: 4b52a6860488280073c5b107d9e7ae824a327fd9
Parents: c6dec2f 6b92778
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:58:38 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:00:34 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b52a686/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/12] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35dc3b65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35dc3b65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35dc3b65
Branch: refs/heads/cassandra-3.11
Commit: 35dc3b652f0ba94ff9977035efe9074174f9c69c
Parents: 826ae9c 82d6840
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 08:22:16 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:23:50 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/35dc3b65/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d68408
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d68408
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d68408
Branch: refs/heads/cassandra-3.11
Commit: 82d684080dac7e1aac61b41395dc5dd84acfda60
Parents: cf0b6d1 4b52a68
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 08:01:00 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:02:29 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d68408/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[12/12] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e395dd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e395dd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e395dd3
Branch: refs/heads/trunk
Commit: 6e395dd3b844627586b688163ee00a0882c76485
Parents: 278906c 35dc3b6
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 08:24:09 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 08:24:56 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e395dd3/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[02/12] cassandra git commit: followup to CASSANDRA-13700;
minor cleanup
Posted by ja...@apache.org.
followup to CASSANDRA-13700; minor cleanup
Patch by jasobrown; reviewed by Joel Knighton for CASSANDRA-13700
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b927783
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b927783
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b927783
Branch: refs/heads/cassandra-2.2
Commit: 6b927783ba0777d3dd7c2c3311b246a8dbce5b59
Parents: a3498d5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue Aug 29 07:52:40 2017 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Tue Aug 29 07:52:40 2017 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b927783/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 7c37917..d3db37f 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -860,8 +860,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* than the version passed in. In this case we also send the old
* heart beat and throw it away on the receiver if it is redundant.
*/
- int localHbGeneration = epState.getHeartBeatState().getGeneration();
- int localHbVersion = epState.getHeartBeatState().getHeartBeatVersion();
+ HeartBeatState heartBeatState = epState.getHeartBeatState();
+ int localHbGeneration = heartBeatState.getGeneration();
+ int localHbVersion = heartBeatState.getHeartBeatVersion();
if (localHbVersion > version)
{
reqdEndpointState = new EndpointState(new HeartBeatState(localHbGeneration, localHbVersion));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org