Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfe11585 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfe11585 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfe11585 Branch: refs/heads/trunk Commit: cfe11585f33987ab11a485b183dcfcd8c7fb69b6 Parents: 59896cb 075403c Author: Robert Stupp <[email protected]> Authored: Tue May 24 09:48:18 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Tue May 24 09:48:18 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/util/NIODataInputStream.java | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfe11585/CHANGES.txt ----------------------------------------------------------------------
