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/ee81b462 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee81b462 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee81b462 Branch: refs/heads/trunk Commit: ee81b462b08eed45726a07193734450b31fea23f Parents: fcc40e5 78f46de Author: Yuki Morishita <[email protected]> Authored: Wed Feb 17 09:53:20 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 17 09:53:20 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/ee81b462/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee81b462/src/java/org/apache/cassandra/tools/BulkLoader.java ----------------------------------------------------------------------
