Updated Branches:
  refs/heads/cassandra-1.1 e45bdb8b6 -> ae3d197a8
  refs/heads/cassandra-1.1.0 b2b8a5349 -> 85934a1e2
  refs/heads/trunk c971e4c7f -> 7f182c362


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

Branch: refs/heads/trunk
Commit: 7f182c3625bbbda6c74cd4a1c2703dcb427a4c47
Parents: c971e4c ae3d197
Author: Brandon Williams <[email protected]>
Authored: Mon Feb 27 10:56:03 2012 -0600
Committer: Brandon Williams <[email protected]>
Committed: Mon Feb 27 10:56:03 2012 -0600

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


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

Reply via email to