Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b7caa13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b7caa13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b7caa13 Branch: refs/heads/trunk Commit: 8b7caa1361897aa387cde94f19ec7b24ab7a535e Parents: 3413e55 2d8ccf0 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Aug 14 14:35:12 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Aug 14 14:35:12 2015 +0100 ---------------------------------------------------------------------- .../cql3/selection/SelectionColumnMappingTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b7caa13/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java ----------------------------------------------------------------------
