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/a44ee2ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a44ee2ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a44ee2ad Branch: refs/heads/trunk Commit: a44ee2ad4a830ac85d87f04efe9741cb0aeafdd1 Parents: fef40a5 86cd423 Author: Brandon Williams <[email protected]> Authored: Tue May 20 11:14:30 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 20 11:14:30 2014 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlConfigHelper.java | 20 ++++++++++---------- .../cassandra/hadoop/cql3/CqlRecordReader.java | 8 ++++++-- 2 files changed, 16 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
