You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/11 20:04:07 UTC
[12/14] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c6078a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c6078a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c6078a7
Branch: refs/heads/trunk
Commit: 0c6078a70cfa83f851c1d2b9ec039e2f00161bfc
Parents: 6eb76a2 1d744b5
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 11 13:03:32 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 11 13:03:32 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 2 +-
.../cassandra/hadoop/cql3/CqlRecordReader.java | 138 ++++++++++++++++++-
.../cassandra/hadoop/pig/CqlNativeStorage.java | 15 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 4 +-
5 files changed, 150 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6078a7/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6078a7/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6078a7/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------