Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16736314 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16736314 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16736314 Branch: refs/heads/trunk Commit: 16736314b7a40de4c35eeccb8c88dfea03fb20e0 Parents: eaf7d81 f970de5 Author: Sam Tunnicliffe <[email protected]> Authored: Wed May 20 10:58:53 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed May 20 10:58:53 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
