You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/28 16:51:07 UTC

[1/7] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches:
  refs/heads/cassandra-1.1 d079c8204 -> 86d7c844c
  refs/heads/trunk d82814ae4 -> cc355ce6b


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

Branch: refs/heads/trunk
Commit: cc355ce6b9e14d138d0d1c86660c57c90c8237dd
Parents: d82814a 86d7c84
Author: Brandon Williams <br...@apache.org>
Authored: Tue Feb 28 09:51:00 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Feb 28 09:51:00 2012 -0600

----------------------------------------------------------------------
 examples/pig/test/populate-cli.txt                 |   18 +++++++++----
 examples/pig/test/test_storage.pig                 |   10 ++++++++
 .../cassandra/hadoop/pig/CassandraStorage.java     |   19 ++++++--------
 3 files changed, 30 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


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