Updated Branches: refs/heads/trunk 72a74c3cb -> 63b6c029f
Merge branch 'cassandra-1.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/63b6c029 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63b6c029 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63b6c029 Branch: refs/heads/trunk Commit: 63b6c029f0e853e1e9977be5daa3942b50aa937c Parents: 72a74c3 8fd3f49 Author: Dave Brosius <[email protected]> Authored: Fri Jun 8 19:33:11 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Jun 8 19:33:11 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/cql3/statements/SelectStatement.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63b6c029/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63b6c029/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
