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/a7a19215 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7a19215 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7a19215 Branch: refs/heads/trunk Commit: a7a19215ca305c532ecbb9700cac47d5af6fe128 Parents: bea3a97 cc0831c Author: Aleksey Yeschenko <[email protected]> Authored: Tue Jan 20 00:47:10 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Jan 20 00:47:10 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7a19215/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7a19215/src/java/org/apache/cassandra/tools/BulkLoader.java ----------------------------------------------------------------------
