You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/12/22 21:30:21 UTC

[01/10] cassandra git commit: Log error when stream session fails

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 e43883137 -> 7c3966bfe
  refs/heads/cassandra-2.2 e654c1bf0 -> ae8baa499
  refs/heads/cassandra-3.0 270e98626 -> a2088b115
  refs/heads/trunk e1cb9b48f -> 3120b8b65


Log error when stream session fails

patch by Paulo Motta; reviewed by yukim for CASSANDRA-9294


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

Branch: refs/heads/cassandra-2.1
Commit: 7c3966bfe3d42daf97fb3b551060958d1c9c017a
Parents: e438831
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Dec 3 13:28:18 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:08 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 581784e..82176c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * Log error when stream session fails (CASSANDRA-9294)
  * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
  * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
  * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 63219d8..98a6f1f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -617,6 +617,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
      */
     public synchronized void sessionFailed()
     {
+        logger.error("[Stream #{}] Remote peer {} failed stream session.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
@@ -665,11 +666,13 @@ public class StreamSession implements IEndpointStateChangeSubscriber
 
     public void onRemove(InetAddress endpoint)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} has left.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
     public void onRestart(InetAddress endpoint, EndpointState epState)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} was restarted.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 


[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/cassandra-3.0
Commit: a2088b115033cc16025c06852c6cf749d1416512
Parents: 270e986 ae8baa4
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 22 14:29:48 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:48 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2088b11/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2088b11/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------


[02/10] cassandra git commit: Log error when stream session fails

Posted by yu...@apache.org.
Log error when stream session fails

patch by Paulo Motta; reviewed by yukim for CASSANDRA-9294


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

Branch: refs/heads/cassandra-2.2
Commit: 7c3966bfe3d42daf97fb3b551060958d1c9c017a
Parents: e438831
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Dec 3 13:28:18 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:08 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 581784e..82176c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * Log error when stream session fails (CASSANDRA-9294)
  * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
  * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
  * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 63219d8..98a6f1f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -617,6 +617,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
      */
     public synchronized void sessionFailed()
     {
+        logger.error("[Stream #{}] Remote peer {} failed stream session.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
@@ -665,11 +666,13 @@ public class StreamSession implements IEndpointStateChangeSubscriber
 
     public void onRemove(InetAddress endpoint)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} has left.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
     public void onRestart(InetAddress endpoint, EndpointState epState)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} was restarted.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 


[04/10] cassandra git commit: Log error when stream session fails

Posted by yu...@apache.org.
Log error when stream session fails

patch by Paulo Motta; reviewed by yukim for CASSANDRA-9294


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

Branch: refs/heads/trunk
Commit: 7c3966bfe3d42daf97fb3b551060958d1c9c017a
Parents: e438831
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Dec 3 13:28:18 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:08 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 581784e..82176c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * Log error when stream session fails (CASSANDRA-9294)
  * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
  * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
  * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 63219d8..98a6f1f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -617,6 +617,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
      */
     public synchronized void sessionFailed()
     {
+        logger.error("[Stream #{}] Remote peer {} failed stream session.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
@@ -665,11 +666,13 @@ public class StreamSession implements IEndpointStateChangeSubscriber
 
     public void onRemove(InetAddress endpoint)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} has left.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
     public void onRestart(InetAddress endpoint, EndpointState epState)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} was restarted.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 


[03/10] cassandra git commit: Log error when stream session fails

Posted by yu...@apache.org.
Log error when stream session fails

patch by Paulo Motta; reviewed by yukim for CASSANDRA-9294


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

Branch: refs/heads/cassandra-3.0
Commit: 7c3966bfe3d42daf97fb3b551060958d1c9c017a
Parents: e438831
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Dec 3 13:28:18 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:08 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 581784e..82176c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * Log error when stream session fails (CASSANDRA-9294)
  * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
  * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
  * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c3966bf/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 63219d8..98a6f1f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -617,6 +617,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
      */
     public synchronized void sessionFailed()
     {
+        logger.error("[Stream #{}] Remote peer {} failed stream session.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
@@ -665,11 +666,13 @@ public class StreamSession implements IEndpointStateChangeSubscriber
 
     public void onRemove(InetAddress endpoint)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} has left.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 
     public void onRestart(InetAddress endpoint, EndpointState epState)
     {
+        logger.error("[Stream #{}] Session failed because remote peer {} was restarted.", planId(), peer.getHostAddress());
         closeSession(State.FAILED);
     }
 


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

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

Branch: refs/heads/trunk
Commit: 3120b8b656392505d2352e235c9e647684b69cf9
Parents: e1cb9b4 a2088b1
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 22 14:29:56 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:56 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3120b8b6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 84e1cb8,be39f29..3b7f389
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,7 -9,12 +32,8 @@@ Merged from 2.2
   * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)


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

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

Branch: refs/heads/cassandra-2.2
Commit: ae8baa499cc628cae7bbfa24e679cfe9aa9b42e3
Parents: e654c1b 7c3966b
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 22 14:29:42 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:42 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1ff1a5c,82176c5..fb0b151
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.13
 +2.2.5
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------


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

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

Branch: refs/heads/trunk
Commit: ae8baa499cc628cae7bbfa24e679cfe9aa9b42e3
Parents: e654c1b 7c3966b
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 22 14:29:42 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:42 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1ff1a5c,82176c5..fb0b151
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.13
 +2.2.5
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------


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

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

Branch: refs/heads/cassandra-3.0
Commit: ae8baa499cc628cae7bbfa24e679cfe9aa9b42e3
Parents: e654c1b 7c3966b
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 22 14:29:42 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:42 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1ff1a5c,82176c5..fb0b151
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.13
 +2.2.5
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------


[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/trunk
Commit: a2088b115033cc16025c06852c6cf749d1416512
Parents: 270e986 ae8baa4
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Dec 22 14:29:48 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Dec 22 14:29:48 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2088b11/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2088b11/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------