Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d97a5ca4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d97a5ca4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d97a5ca4
Branch: refs/heads/trunk
Commit: d97a5ca4d46a85be24560fcd7639df1e074b9cf3
Parents: 106977d 6fb7512
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 23 10:43:06 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 23 10:43:06 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
src/java/org/apache/cassandra/cql3/Cql.g | 8 ++++-
.../cassandra/cql3/statements/SelectStatement.java | 24 ++++++++++++++-
.../org/apache/cassandra/db/CounterColumn.java | 12 ++++++-
4 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d97a5ca4/CHANGES.txt
----------------------------------------------------------------------
|