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/3612b84c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3612b84c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3612b84c Branch: refs/heads/trunk Commit: 3612b84c69180c47cca9898f48ac0ae869c94711 Parents: 8a3fc02 2d21160 Author: Sylvain Lebresne <[email protected]> Authored: Tue Aug 5 14:47:42 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Aug 5 14:47:42 2014 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
