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/0dccea4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dccea4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0dccea4f Branch: refs/heads/trunk Commit: 0dccea4f3600ea29bf4e146ed2c2a49b615187c3 Parents: 8d1bb07 2f248b3 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 25 11:11:41 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 25 11:11:41 2013 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/pig/AbstractCassandraStorage.java | 4 +++- .../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 6 +++++- src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0dccea4f/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java ----------------------------------------------------------------------
