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/a29778a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a29778a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a29778a4 Branch: refs/heads/trunk Commit: a29778a4beaa61c5a705ae5e58eccfd16b9add4c Parents: bd46463 1f99e70 Author: Robert Stupp <[email protected]> Authored: Thu Oct 1 14:17:50 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Thu Oct 1 14:17:50 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop/cql3/CqlBulkOutputFormat.java | 32 ++++++++++++++++++++ .../hadoop/cql3/CqlBulkRecordWriter.java | 13 +++++++- 3 files changed, 45 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a29778a4/CHANGES.txt ----------------------------------------------------------------------
