Updated Branches:
  refs/heads/cassandra-1.1 962b23ba0 -> 7f6cc5ef6
  refs/heads/trunk e117cbe2b -> 2f4c7c4dc


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/2f4c7c4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f4c7c4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f4c7c4d

Branch: refs/heads/trunk
Commit: 2f4c7c4dc3ab78d1051ec8f445bbb52c6593abf2
Parents: e117cbe 7f6cc5e
Author: Brandon Williams <[email protected]>
Authored: Fri Jul 13 10:39:19 2012 -0500
Committer: Brandon Williams <[email protected]>
Committed: Fri Jul 13 10:39:19 2012 -0500

----------------------------------------------------------------------
 examples/pig/test/populate-cli.txt                 |   20 +++++++
 examples/pig/test/test_storage.pig                 |   17 +++++-
 .../cassandra/hadoop/pig/CassandraStorage.java     |   44 +++++++++++++-
 3 files changed, 76 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f4c7c4d/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------

Reply via email to