Merge branch 'cassandra-3.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/3820e89d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3820e89d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3820e89d Branch: refs/heads/trunk Commit: 3820e89d9e4a630f1e7a651926f9fe1124dfa2cb Parents: ce6296b 11b073e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Nov 10 16:33:26 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Nov 10 16:33:26 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3820e89d/CHANGES.txt ----------------------------------------------------------------------