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/a19c9128 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a19c9128 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a19c9128 Branch: refs/heads/trunk Commit: a19c9128010a2925b9654976b5123df87f4b35a7 Parents: 27fdf42 63cb95e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 14 00:25:56 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 14 00:25:56 2014 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/ResultSet.java | 2 +- .../cql3/PreparedStatementCleanupTest.java | 86 ------------- .../cassandra/cql3/PreparedStatementsTest.java | 122 +++++++++++++++++++ 3 files changed, 123 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a19c9128/src/java/org/apache/cassandra/cql3/ResultSet.java ----------------------------------------------------------------------
