Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2130b2e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2130b2e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2130b2e2 Branch: refs/heads/trunk Commit: 2130b2e2a0b1f288f1d4969acb588bc020ab9cbf Parents: 59c6e50 a3dbc3d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jul 25 10:53:09 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jul 25 10:53:09 2013 -0500 ---------------------------------------------------------------------- examples/pig/README.txt | 2 +- .../hadoop/pig/AbstractCassandraStorage.java | 48 +++++++++-- .../cassandra/hadoop/pig/CassandraStorage.java | 30 ------- .../apache/cassandra/hadoop/pig/CqlStorage.java | 84 +++++++++++++------- 4 files changed, 98 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2130b2e2/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2130b2e2/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2130b2e2/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ----------------------------------------------------------------------
