Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60c7c73c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60c7c73c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60c7c73c Branch: refs/heads/cassandra-2.1 Commit: 60c7c73c45d3908c3f200941b3d439d29cfd35db Parents: acb4cf6 4b8bb86 Author: Brandon Williams <[email protected]> Authored: Mon Jun 9 13:43:20 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Jun 9 13:43:20 2014 -0500 ---------------------------------------------------------------------- .../AbstractColumnFamilyOutputFormat.java | 22 +++++++++++++------- .../cassandra/hadoop/cql3/CqlRecordWriter.java | 7 ++++++- 2 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60c7c73c/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ----------------------------------------------------------------------
