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/29 21:43:11 UTC
[1/12] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 32f5d0641 -> 2fc2bd393
refs/heads/cassandra-1.1.0 0447837b2 -> 470873fcb
refs/heads/trunk 0e701097a -> 4bae17438
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/4bae1743
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bae1743
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bae1743
Branch: refs/heads/trunk
Commit: 4bae174380f9dcc4f79f515506ae498a9a105359
Parents: 0e70109 2fc2bd3
Author: Brandon Williams <br...@apache.org>
Authored: Wed Feb 29 14:43:03 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Feb 29 14:43:03 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 +
examples/pig/test/populate-cli.txt | 20 +++++++++
examples/pig/test/test_storage.pig | 21 ++++++++++
.../db/marshal/AbstractCompositeType.java | 32 +++++++++++++++
.../cassandra/hadoop/pig/CassandraStorage.java | 31 ++++++++++++++-
5 files changed, 105 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bae1743/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bae1743/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------