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/9f322ac6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f322ac6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f322ac6 Branch: refs/heads/trunk Commit: 9f322ac600d8cbd8d06427a0b11cea59991ba5ee Parents: 097ce38 ee81b46 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Feb 17 09:53:28 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Feb 17 09:53:28 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/BulkLoader.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f322ac6/CHANGES.txt ----------------------------------------------------------------------
