Updated Branches: refs/heads/trunk e73b2a68b -> d62f8c1e5
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/d62f8c1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d62f8c1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d62f8c1e Branch: refs/heads/trunk Commit: d62f8c1e5f4a901652cd9dd7ef7f8ecb4b779450 Parents: e73b2a6 6f384c5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jul 25 12:09:14 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jul 25 12:09:14 2012 -0500 ---------------------------------------------------------------------- examples/pig/test/populate-cli.txt | 4 ++-- .../cassandra/hadoop/pig/CassandraStorage.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d62f8c1e/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ----------------------------------------------------------------------