Merge branch 'cassandra-1.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/2ca07f52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ca07f52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ca07f52 Branch: refs/heads/trunk Commit: 2ca07f5238c5d918f78361e1fa35beb84205cf6a Parents: 66a5e09 0bff5f5 Author: Dave Brosius <dbros...@apache.org> Authored: Sun Jun 16 13:20:28 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sun Jun 16 13:20:28 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/statements/SelectStatement.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca07f52/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca07f52/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------