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/1944e402 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1944e402 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1944e402 Branch: refs/heads/trunk Commit: 1944e402cf4b4f64e8e7ea82ee3df0075916c164 Parents: ef54c6c 7ca4db0 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Sep 15 16:16:56 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Sep 15 16:16:56 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop/cql3/CqlBulkRecordWriter.java | 13 +- .../cassandra/hadoop/pig/CqlNativeStorage.java | 171 ++++++++++++------- test/conf/cassandra_pig.yaml | 41 +++++ .../org/apache/cassandra/pig/CqlTableTest.java | 35 ++++ .../org/apache/cassandra/pig/PigTestBase.java | 3 +- 6 files changed, 203 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1944e402/CHANGES.txt ----------------------------------------------------------------------
