Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c148e2ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c148e2ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c148e2ad Branch: refs/heads/trunk Commit: c148e2ada997a0ee8fb5b43a795a808923d139c3 Parents: 12c694e bd6a766 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jun 27 10:27:16 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jun 27 10:27:16 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c148e2ad/CHANGES.txt ----------------------------------------------------------------------
