Merge branch 'cassandra-2.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/4698b8f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4698b8f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4698b8f1 Branch: refs/heads/trunk Commit: 4698b8f1d3e7880b0a7dd93b0d83d3da035ed687 Parents: 1375e7f 60c7c73 Author: Brandon Williams <[email protected]> Authored: Mon Jun 9 13:51:22 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Jun 9 13:51:22 2014 -0500 ---------------------------------------------------------------------- .../AbstractColumnFamilyOutputFormat.java | 22 +++++++++++++------- .../cassandra/hadoop/cql3/CqlRecordWriter.java | 7 ++++++- 2 files changed, 20 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
