Updated Branches: refs/heads/cassandra-1.1 fdd3721fb -> 0f3ff051e refs/heads/trunk 07f39e8ec -> 8fa285c8b
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/8fa285c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fa285c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fa285c8 Branch: refs/heads/trunk Commit: 8fa285c8b17791e3651050125f8cdf831e35f682 Parents: 07f39e8 0f3ff05 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Feb 6 14:59:10 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Feb 6 14:59:10 2012 -0600 ---------------------------------------------------------------------- bin/cqlsh | 2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 15 ++++++++++++--- .../cassandra/hadoop/pig/CassandraStorage.java | 5 ++++- 3 files changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fa285c8/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ----------------------------------------------------------------------
