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/be6cb9d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be6cb9d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be6cb9d9 Branch: refs/heads/trunk Commit: be6cb9d97e45d2255534002517a5926066769861 Parents: 81858eb 1fbdba2 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Jun 16 15:26:17 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Jun 16 15:26:17 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/cql3/ResultSet.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be6cb9d9/CHANGES.txt ----------------------------------------------------------------------
