Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50ea0182 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50ea0182 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50ea0182 Branch: refs/heads/trunk Commit: 50ea0182e784413e2fba89a97bf7d0c6b8d4570b Parents: db1cf3e db1a741 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Mar 17 14:38:33 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Mar 17 14:38:33 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/BulkLoader.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50ea0182/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50ea0182/src/java/org/apache/cassandra/tools/BulkLoader.java ----------------------------------------------------------------------
