cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/5] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 23 Nov 2012 09:44:26 GMT
Updated Branches:
  refs/heads/trunk c12d7cf44 -> be89a954b


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/CounterColumn.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89a954
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89a954
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89a954

Branch: refs/heads/trunk
Commit: be89a954b369802896599a8bd2003499b95f1112
Parents: c12d7cf d97a5ca
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 23 10:44:18 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 23 10:44:18 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/be89a954/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message