Merge branch 'cassandra-2.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/7246502e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7246502e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7246502e Branch: refs/heads/trunk Commit: 7246502e7f6cd1e98b5199412541b621d7f12ffa Parents: 3822612 678aa37 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 10 13:45:13 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 10 13:45:13 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop/pig/AbstractCassandraStorage.java | 78 +++++++++++++++----- .../apache/cassandra/hadoop/pig/CqlStorage.java | 78 +++++++++++++++++++- 3 files changed, 135 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7246502e/CHANGES.txt ----------------------------------------------------------------------
