cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Date Tue, 07 Feb 2012 10:21:41 GMT
Updated Branches:
  refs/heads/trunk 9f668caed -> 45e4484cc


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

Branch: refs/heads/trunk
Commit: 45e4484ccca04872cafd9aa5e5e4174603c90580
Parents: 9f668ca 3459c38
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Feb 7 11:21:25 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Feb 7 11:21:25 2012 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/cql3/CFDefinition.java    |    4 +-
 .../cassandra/cql3/statements/SelectStatement.java |  435 +++++++++------
 2 files changed, 270 insertions(+), 169 deletions(-)
----------------------------------------------------------------------



Mime
View raw message