Merge branch 'cassandra-1.2' into cassandra-2.0

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a29c748
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a29c748
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a29c748

Branch: refs/heads/trunk
Commit: 3a29c748071e229686970d41a9371334ed74cdc7
Parents: b0b868f 17ae042
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Oct 14 13:34:13 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Oct 14 13:34:13 2013 -0500

----------------------------------------------------------------------
 examples/pig/example-populate-cql.txt  |  24 ++++
 examples/pig/example-script.pig        |  13 ++
 examples/pig/libdata.csv               | 200 ++++++++++++++++++++++++++++
 examples/pig/test/populate-cql.txt     |  33 +++++
 examples/pig/test/test_cql_storage.pig |  14 ++
 5 files changed, 284 insertions(+)
----------------------------------------------------------------------


Reply via email to