cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 21 Nov 2012 08:14:27 GMT
Updated Branches:
  refs/heads/trunk 298606afd -> 86447b7df


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

Branch: refs/heads/trunk
Commit: 86447b7df829a1e8040bd428ad1d86568dbd30f6
Parents: 298606a 3479c63
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Nov 21 09:14:20 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Nov 21 09:14:20 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/cql3/Cql.g           |   39 +++--
 .../cassandra/cql3/operations/ColumnOperation.java |   27 +---
 .../cassandra/cql3/operations/ListOperation.java   |   83 +++++++--
 .../cassandra/cql3/operations/MapOperation.java    |   24 ++-
 .../cassandra/cql3/operations/Operation.java       |    9 +-
 .../cql3/operations/PreparedOperation.java         |  143 +++++++++++++++
 .../cassandra/cql3/operations/SetOperation.java    |   44 ++++-
 .../cassandra/cql3/statements/UpdateStatement.java |   25 +--
 9 files changed, 298 insertions(+), 97 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86447b7d/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message