You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/12/02 17:14:17 UTC
[01/14] cassandra git commit: bump 2.1 versions
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 4743fd763 -> b89037fe4
refs/heads/cassandra-3.1 4ee374ab3 -> 82d5f6ad5
refs/heads/trunk d30c30bb9 -> 57e86f7c0
bump 2.1 versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6619e56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6619e56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6619e56
Branch: refs/heads/cassandra-3.1
Commit: a6619e56b10580627fbc7863862c5aaebef57518
Parents: 1538c09
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:50:22 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:50:22 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6619e56/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 45bb13f..4bbbe69 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.1.11"/>
+ <property name="base.version" value="2.1.12"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6619e56/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 9ffa66d..3322534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.12) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Wed, 02 Dec 2015 10:38:36 -0500
+
cassandra (2.1.11) unstable; urgency=medium
* New release
[13/14] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d5f6ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d5f6ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d5f6ad
Branch: refs/heads/cassandra-3.1
Commit: 82d5f6ad599a5f19771155c5e0f839219bd6da07
Parents: 4ee374a b89037f
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 2 11:11:23 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:11:23 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[06/14] cassandra git commit: bump 2.2 versions
Posted by jm...@apache.org.
bump 2.2 versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16045358
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16045358
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16045358
Branch: refs/heads/trunk
Commit: 16045358a43656a756574cba03f51ab3db6cc2b7
Parents: 73a1c2c
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:53:01 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:53:01 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16045358/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6110bb0..b49191e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.2.3"/>
+ <property name="base.version" value="2.2.4"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16045358/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 31fa8e6..165cd8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.4) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Wed, 02 Dec 2015 10:52:18 -0500
+
cassandra (2.2.3) unstable; urgency=medium
* New release
[05/14] cassandra git commit: bump 2.2 versions
Posted by jm...@apache.org.
bump 2.2 versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16045358
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16045358
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16045358
Branch: refs/heads/cassandra-3.1
Commit: 16045358a43656a756574cba03f51ab3db6cc2b7
Parents: 73a1c2c
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:53:01 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:53:01 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16045358/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6110bb0..b49191e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.2.3"/>
+ <property name="base.version" value="2.2.4"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16045358/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 31fa8e6..165cd8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.4) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Wed, 02 Dec 2015 10:52:18 -0500
+
cassandra (2.2.3) unstable; urgency=medium
* New release
[12/14] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d5f6ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d5f6ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d5f6ad
Branch: refs/heads/trunk
Commit: 82d5f6ad599a5f19771155c5e0f839219bd6da07
Parents: 4ee374a b89037f
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 2 11:11:23 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:11:23 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[08/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@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/4743fd76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4743fd76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4743fd76
Branch: refs/heads/trunk
Commit: 4743fd7631e645a5c75a3da2eeb3870af36e985f
Parents: e00e32e 1604535
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:53:38 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:53:38 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@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/4743fd76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4743fd76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4743fd76
Branch: refs/heads/cassandra-3.1
Commit: 4743fd7631e645a5c75a3da2eeb3870af36e985f
Parents: e00e32e 1604535
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:53:38 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:53:38 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@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/73a1c2c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73a1c2c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73a1c2c1
Branch: refs/heads/cassandra-3.1
Commit: 73a1c2c1fad6682f528124c3e61a626fa2135109
Parents: 9751eb5 a6619e5
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:51:15 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:51:15 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/14] cassandra git commit: Fix potential NPE while assasinating
unknown endpoint
Posted by jm...@apache.org.
Fix potential NPE while assasinating unknown endpoint
Patch by dbrosius; reviewed by jknighton for CASSANDRA-9510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b89037fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b89037fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b89037fe
Branch: refs/heads/trunk
Commit: b89037fe400b2b5097961c8276fa5c157b6cd49c
Parents: 4743fd7
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Dec 2 11:06:40 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:06:40 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b89037fe/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 83ae92d..43a45cf 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -580,17 +580,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
}
else
{
- try
- {
- tokens = StorageService.instance.getTokenMetadata().getTokens(endpoint);
- }
- catch (Throwable th)
- {
- JVMStabilityInspector.inspectThrowable(th);
- // TODO this is broken
- logger.warn("Unable to calculate tokens for {}. Will use a random one", address);
- tokens = Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
- }
int generation = epState.getHeartBeatState().getGeneration();
int heartbeat = epState.getHeartBeatState().getHeartBeatVersion();
logger.info("Sleeping for {}ms to ensure {} does not change", StorageService.RING_DELAY, endpoint);
@@ -607,6 +596,18 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
epState.getHeartBeatState().forceNewerGenerationUnsafe();
}
+ try
+ {
+ tokens = StorageService.instance.getTokenMetadata().getTokens(endpoint);
+ }
+ catch (Throwable th)
+ {
+ JVMStabilityInspector.inspectThrowable(th);
+ // TODO this is broken
+ logger.warn("Unable to calculate tokens for {}. Will use a random one", address);
+ tokens = Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
+ }
+
// do not pass go, do not collect 200 dollars, just gtfo
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
handleMajorStateChange(endpoint, epState);
[10/14] cassandra git commit: Fix potential NPE while assasinating
unknown endpoint
Posted by jm...@apache.org.
Fix potential NPE while assasinating unknown endpoint
Patch by dbrosius; reviewed by jknighton for CASSANDRA-9510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b89037fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b89037fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b89037fe
Branch: refs/heads/cassandra-3.0
Commit: b89037fe400b2b5097961c8276fa5c157b6cd49c
Parents: 4743fd7
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Dec 2 11:06:40 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:06:40 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b89037fe/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 83ae92d..43a45cf 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -580,17 +580,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
}
else
{
- try
- {
- tokens = StorageService.instance.getTokenMetadata().getTokens(endpoint);
- }
- catch (Throwable th)
- {
- JVMStabilityInspector.inspectThrowable(th);
- // TODO this is broken
- logger.warn("Unable to calculate tokens for {}. Will use a random one", address);
- tokens = Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
- }
int generation = epState.getHeartBeatState().getGeneration();
int heartbeat = epState.getHeartBeatState().getHeartBeatVersion();
logger.info("Sleeping for {}ms to ensure {} does not change", StorageService.RING_DELAY, endpoint);
@@ -607,6 +596,18 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
epState.getHeartBeatState().forceNewerGenerationUnsafe();
}
+ try
+ {
+ tokens = StorageService.instance.getTokenMetadata().getTokens(endpoint);
+ }
+ catch (Throwable th)
+ {
+ JVMStabilityInspector.inspectThrowable(th);
+ // TODO this is broken
+ logger.warn("Unable to calculate tokens for {}. Will use a random one", address);
+ tokens = Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
+ }
+
// do not pass go, do not collect 200 dollars, just gtfo
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
handleMajorStateChange(endpoint, epState);
[02/14] cassandra git commit: bump 2.1 versions
Posted by jm...@apache.org.
bump 2.1 versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6619e56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6619e56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6619e56
Branch: refs/heads/trunk
Commit: a6619e56b10580627fbc7863862c5aaebef57518
Parents: 1538c09
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:50:22 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:50:22 2015 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6619e56/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 45bb13f..4bbbe69 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.1.11"/>
+ <property name="base.version" value="2.1.12"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6619e56/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 9ffa66d..3322534 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.12) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Wed, 02 Dec 2015 10:38:36 -0500
+
cassandra (2.1.11) unstable; urgency=medium
* New release
[09/14] cassandra git commit: Fix potential NPE while assasinating
unknown endpoint
Posted by jm...@apache.org.
Fix potential NPE while assasinating unknown endpoint
Patch by dbrosius; reviewed by jknighton for CASSANDRA-9510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b89037fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b89037fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b89037fe
Branch: refs/heads/cassandra-3.1
Commit: b89037fe400b2b5097961c8276fa5c157b6cd49c
Parents: 4743fd7
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Dec 2 11:06:40 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:06:40 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b89037fe/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 83ae92d..43a45cf 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -580,17 +580,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
}
else
{
- try
- {
- tokens = StorageService.instance.getTokenMetadata().getTokens(endpoint);
- }
- catch (Throwable th)
- {
- JVMStabilityInspector.inspectThrowable(th);
- // TODO this is broken
- logger.warn("Unable to calculate tokens for {}. Will use a random one", address);
- tokens = Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
- }
int generation = epState.getHeartBeatState().getGeneration();
int heartbeat = epState.getHeartBeatState().getHeartBeatVersion();
logger.info("Sleeping for {}ms to ensure {} does not change", StorageService.RING_DELAY, endpoint);
@@ -607,6 +596,18 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
epState.getHeartBeatState().forceNewerGenerationUnsafe();
}
+ try
+ {
+ tokens = StorageService.instance.getTokenMetadata().getTokens(endpoint);
+ }
+ catch (Throwable th)
+ {
+ JVMStabilityInspector.inspectThrowable(th);
+ // TODO this is broken
+ logger.warn("Unable to calculate tokens for {}. Will use a random one", address);
+ tokens = Collections.singletonList(StorageService.instance.getTokenMetadata().partitioner.getRandomToken());
+ }
+
// do not pass go, do not collect 200 dollars, just gtfo
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.left(tokens, computeExpireTime()));
handleMajorStateChange(endpoint, epState);
[14/14] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.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/57e86f7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e86f7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57e86f7c
Branch: refs/heads/trunk
Commit: 57e86f7c099a17c9186f66c8c31543ba7a888a72
Parents: d30c30b 82d5f6a
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Dec 2 11:14:04 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Dec 2 11:14:04 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[04/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@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/73a1c2c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73a1c2c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73a1c2c1
Branch: refs/heads/trunk
Commit: 73a1c2c1fad6682f528124c3e61a626fa2135109
Parents: 9751eb5 a6619e5
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Dec 2 10:51:15 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Dec 2 10:51:15 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------