Updated Branches: refs/heads/trunk b241bcd08 -> 647ef5aeb
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/647ef5ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/647ef5ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/647ef5ae Branch: refs/heads/trunk Commit: 647ef5aeb3bd06018d5b7a50f756ce59f8e65fff Parents: b241bcd df580d4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Dec 11 08:54:58 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 11 08:54:58 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/statements/SelectStatement.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/647ef5ae/CHANGES.txt ----------------------------------------------------------------------
