Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cad7329 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cad7329 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cad7329 Branch: refs/heads/trunk Commit: 8cad73290c9eed1d6f1a714359c6dbae8d6d5f92 Parents: 3b126fd 2cd59b8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 15 20:21:20 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 15 20:21:20 2015 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
