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/86cd4234 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86cd4234 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86cd4234 Branch: refs/heads/trunk Commit: 86cd423489236adf564c8ce65dd354e92ef8fb90 Parents: 57fa76f 0356ee7 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 20 11:14:20 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 20 11:14:20 2014 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlConfigHelper.java | 20 ++++++++++---------- .../cassandra/hadoop/cql3/CqlRecordReader.java | 8 ++++++-- 2 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86cd4234/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ----------------------------------------------------------------------
