Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3572cfdc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3572cfdc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3572cfdc Branch: refs/heads/trunk Commit: 3572cfdce46f6728424dfd0c877e28cc72154b31 Parents: 3f0dd5d 8b9c91e Author: Sam Tunnicliffe <[email protected]> Authored: Thu Jun 25 10:02:54 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Jun 25 10:02:54 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../format/big/SSTableNamesIterator.java | 3 -- .../cassandra/cql3/LargeCompactValueTest.java | 50 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3572cfdc/CHANGES.txt ----------------------------------------------------------------------
