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/17d9791d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d9791d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d9791d Branch: refs/heads/trunk Commit: 17d9791d63c4bfde657ac1c13b45d1a357ce44bd Parents: b5a232b 12b9691 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Dec 27 15:19:28 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Dec 27 15:19:28 2014 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlRecordWriter.java | 26 +++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d9791d/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ----------------------------------------------------------------------
