Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ecb7a4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ecb7a4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ecb7a4f Branch: refs/heads/trunk Commit: 1ecb7a4f92da22eaee9fb5f96d022f7de446a823 Parents: cdaba04 0afe4be Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Sep 15 21:24:13 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Sep 15 21:24:13 2015 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlInputFormat.java | 59 ++++++-------------- 1 file changed, 16 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
