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/29f8a5c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29f8a5c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29f8a5c3 Branch: refs/heads/trunk Commit: 29f8a5c39bfb714cec3a93a26301cb6ff848fe71 Parents: cfe1158 ea14570 Author: Yuki Morishita <[email protected]> Authored: Tue May 24 14:46:37 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue May 24 14:46:37 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/BulkLoader.java | 2 +- .../apache/cassandra/tools/LoaderOptions.java | 36 ++++++++++++-------- 3 files changed, 23 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29f8a5c3/CHANGES.txt ----------------------------------------------------------------------
