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/94cfec89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94cfec89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94cfec89 Branch: refs/heads/trunk Commit: 94cfec89b8bf9401a7f4f1b49d59679e4c50f598 Parents: 774f3ac 7fc89ad Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Aug 6 09:08:42 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Aug 6 09:08:42 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/hadoop/cql3/CqlInputFormat.java | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94cfec89/CHANGES.txt ----------------------------------------------------------------------
