You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/05/03 10:00:56 UTC

[1/2] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches:
  refs/heads/trunk a0f5dc515 -> fb2bfc984


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/fb2bfc98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb2bfc98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb2bfc98

Branch: refs/heads/trunk
Commit: fb2bfc9846fa12211adf45e1bac23814fe099740
Parents: a0f5dc5 a75b708
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu May 3 10:00:36 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu May 3 10:00:36 2012 +0200

----------------------------------------------------------------------
 .../cassandra/cql3/statements/SelectStatement.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb2bfc98/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------