Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/066ba25c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/066ba25c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/066ba25c Branch: refs/heads/trunk Commit: 066ba25c53ff5753521e5c9a78c434916d57607f Parents: 343612a 599dbbc Author: Paulo Motta <pa...@apache.org> Authored: Fri Dec 9 16:20:47 2016 -0200 Committer: Paulo Motta <pa...@apache.org> Committed: Fri Dec 9 16:20:47 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + src/java/org/apache/cassandra/config/Config.java | 12 ------------ .../cassandra/hadoop/cql3/CqlBulkRecordWriter.java | 1 - .../apache/cassandra/net/OutboundTcpConnectionPool.java | 7 +------ 5 files changed, 3 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/066ba25c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/066ba25c/NEWS.txt ----------------------------------------------------------------------
