You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/09/17 03:40:35 UTC

[01/15] cassandra git commit: Forgot a damn c/r

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 3aff44915 -> 718e47f08
  refs/heads/cassandra-2.1 e889ee408 -> ba5837ea2
  refs/heads/cassandra-2.2 e63dacf79 -> b62fde1bb
  refs/heads/cassandra-3.0 9218d7456 -> dd9a0abf2
  refs/heads/trunk 10b11835a -> 8eafe2282


Forgot a damn c/r


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/718e47f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718e47f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718e47f0

Branch: refs/heads/cassandra-2.0
Commit: 718e47f084019f1b22d8a66d911a6cbbcaf6483c
Parents: 3aff449
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:17 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:17 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/718e47f0/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index edbe578..68289fe 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -156,7 +156,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         }
         else
         {
-            sb.append("  TOKENS: not present");
+            sb.append("  TOKENS: not present\n");
         }
     }

[15/15] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8eafe228
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8eafe228
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8eafe228

Branch: refs/heads/trunk
Commit: 8eafe22827876a01a5f1e7836e4cf435d83f457c
Parents: 10b1183 dd9a0ab
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:40:27 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:40:27 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[10/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by br...@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/b62fde1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b62fde1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b62fde1b

Branch: refs/heads/trunk
Commit: b62fde1bb711ac48f7286371fbc6d661b4c69af6
Parents: e63dacf ba5837e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:40:00 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:40:00 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b62fde1b/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

[03/15] cassandra git commit: Forgot a damn c/r

Posted by br...@apache.org.
Forgot a damn c/r


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/718e47f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718e47f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718e47f0

Branch: refs/heads/trunk
Commit: 718e47f084019f1b22d8a66d911a6cbbcaf6483c
Parents: 3aff449
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:17 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:17 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/718e47f0/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index edbe578..68289fe 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -156,7 +156,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         }
         else
         {
-            sb.append("  TOKENS: not present");
+            sb.append("  TOKENS: not present\n");
         }
     }

[04/15] cassandra git commit: Forgot a damn c/r

Posted by br...@apache.org.
Forgot a damn c/r


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/718e47f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718e47f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718e47f0

Branch: refs/heads/cassandra-2.2
Commit: 718e47f084019f1b22d8a66d911a6cbbcaf6483c
Parents: 3aff449
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:17 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:17 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/718e47f0/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index edbe578..68289fe 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -156,7 +156,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         }
         else
         {
-            sb.append("  TOKENS: not present");
+            sb.append("  TOKENS: not present\n");
         }
     }

[14/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by br...@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/dd9a0abf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd9a0abf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd9a0abf

Branch: refs/heads/trunk
Commit: dd9a0abf2e43db6ff9037aa4bbb61c2f7a4315b4
Parents: 9218d74 b62fde1
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:40:18 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:40:18 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[06/15] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba5837ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba5837ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba5837ea

Branch: refs/heads/trunk
Commit: ba5837ea25018f17e2a656e6ead7a0585053e574
Parents: e889ee4 718e47f
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:39 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:39 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba5837ea/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

[11/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by br...@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/b62fde1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b62fde1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b62fde1b

Branch: refs/heads/cassandra-3.0
Commit: b62fde1bb711ac48f7286371fbc6d661b4c69af6
Parents: e63dacf ba5837e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:40:00 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:40:00 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b62fde1b/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

[02/15] cassandra git commit: Forgot a damn c/r

Posted by br...@apache.org.
Forgot a damn c/r


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/718e47f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718e47f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718e47f0

Branch: refs/heads/cassandra-2.1
Commit: 718e47f084019f1b22d8a66d911a6cbbcaf6483c
Parents: 3aff449
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:17 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:17 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/718e47f0/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index edbe578..68289fe 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -156,7 +156,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         }
         else
         {
-            sb.append("  TOKENS: not present");
+            sb.append("  TOKENS: not present\n");
         }
     }

[05/15] cassandra git commit: Forgot a damn c/r

Posted by br...@apache.org.
Forgot a damn c/r


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/718e47f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718e47f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718e47f0

Branch: refs/heads/cassandra-3.0
Commit: 718e47f084019f1b22d8a66d911a6cbbcaf6483c
Parents: 3aff449
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:17 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:17 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/718e47f0/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index edbe578..68289fe 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -156,7 +156,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         }
         else
         {
-            sb.append("  TOKENS: not present");
+            sb.append("  TOKENS: not present\n");
         }
     }

[12/15] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Posted by br...@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/b62fde1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b62fde1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b62fde1b

Branch: refs/heads/cassandra-2.2
Commit: b62fde1bb711ac48f7286371fbc6d661b4c69af6
Parents: e63dacf ba5837e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:40:00 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:40:00 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b62fde1b/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

[13/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by br...@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/dd9a0abf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd9a0abf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd9a0abf

Branch: refs/heads/cassandra-3.0
Commit: dd9a0abf2e43db6ff9037aa4bbb61c2f7a4315b4
Parents: 9218d74 b62fde1
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:40:18 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:40:18 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[08/15] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba5837ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba5837ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba5837ea

Branch: refs/heads/cassandra-2.2
Commit: ba5837ea25018f17e2a656e6ead7a0585053e574
Parents: e889ee4 718e47f
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:39 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:39 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba5837ea/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

[09/15] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba5837ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba5837ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba5837ea

Branch: refs/heads/cassandra-3.0
Commit: ba5837ea25018f17e2a656e6ead7a0585053e574
Parents: e889ee4 718e47f
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:39 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:39 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba5837ea/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------

[07/15] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba5837ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba5837ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba5837ea

Branch: refs/heads/cassandra-2.1
Commit: ba5837ea25018f17e2a656e6ead7a0585053e574
Parents: e889ee4 718e47f
Author: Brandon Williams <br...@apache.org>
Authored: Wed Sep 16 20:39:39 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Sep 16 20:39:39 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba5837ea/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------