Merge branch 'cassandra-2.0' into trunk

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

Branch: refs/heads/trunk
Commit: bb13b803cde71b8d05371f0291d212c996342ea1
Parents: 0b3a0a6 3a29c74
Author: Brandon Williams <[email protected]>
Authored: Mon Oct 14 13:34:26 2013 -0500
Committer: Brandon Williams <[email protected]>
Committed: Mon Oct 14 13:34:26 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