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/05/01 19:06:57 UTC
[1/7] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 f1ee34f08 -> 0529feb79
refs/heads/trunk 85a42a59d -> 13f695365
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/13f69536
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13f69536
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13f69536
Branch: refs/heads/trunk
Commit: 13f695365eb82a502cda0d5227516280b5ad8c81
Parents: 85a42a5 0529feb
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 1 12:06:48 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 1 12:06:48 2012 -0500
----------------------------------------------------------------------
examples/pig/test/populate-cli.txt | 6 ++++++
.../cassandra/hadoop/pig/CassandraStorage.java | 4 +++-
2 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13f69536/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------