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/091db648 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/091db648 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/091db648 Branch: refs/heads/trunk Commit: 091db6482b6b3fbadaa8d8a7ff8471f9ae035e53 Parents: b5671f0 8a5365e Author: Jonathan Ellis <[email protected]> Authored: Wed May 14 10:01:40 2014 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 14 10:01:40 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/091db648/CHANGES.txt ----------------------------------------------------------------------
