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/b56def49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b56def49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b56def49 Branch: refs/heads/trunk Commit: b56def49f575c5bc7e15f6cb947f02589b5544f2 Parents: e4a53f4 77924b3 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Aug 31 16:06:28 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Aug 31 16:06:28 2016 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/IncomingStreamingConnection.java | 5 ++--- src/java/org/apache/cassandra/net/MessagingService.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b56def49/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b56def49/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
