Updated Branches: refs/heads/cassandra-1.1 dad8d80fe -> db68e03f7 refs/heads/trunk 15d690fdc -> 802bee2bf
Merge branch 'cassandra-1.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/802bee2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/802bee2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/802bee2b Branch: refs/heads/trunk Commit: 802bee2bf31f7020f3e922a559ab71d252d470b7 Parents: 15d690f db68e03 Author: Brandon Williams <[email protected]> Authored: Sat May 26 10:40:03 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Sat May 26 10:40:03 2012 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/pig/CassandraStorage.java | 147 ++++++++++++++- 1 files changed, 144 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/802bee2b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ----------------------------------------------------------------------
