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/42e483a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42e483a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42e483a4 Branch: refs/heads/trunk Commit: 42e483a4e1dc69e886e4c0d1117d7081abaa3768 Parents: f147524 1cb426b Author: Brandon Williams <[email protected]> Authored: Tue Jan 13 10:27:18 2015 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 13 10:27:18 2015 -0600 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 11 +++++++++++ .../apache/cassandra/hadoop/cql3/CqlRecordReader.java | 12 ++++++++++++ .../cassandra/hadoop/pig/AbstractCassandraStorage.java | 5 ++++- .../apache/cassandra/hadoop/pig/CqlNativeStorage.java | 4 ++++ 4 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e483a4/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e483a4/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e483a4/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java ----------------------------------------------------------------------
