Merge branch 'cassandra-2.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/dca300d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dca300d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dca300d6 Branch: refs/heads/trunk Commit: dca300d6c546f99c52778f0db597721365233d42 Parents: 7dd9ea2 70239e1 Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 12:42:38 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 12:42:38 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/BulkLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
