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/12/05 09:03:19 UTC

[2/4] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

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

Branch: refs/heads/trunk
Commit: f65e5200736ca8f26b1ffb5854e779cd7a7b9a88
Parents: dc682de ba8dfe3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Dec 5 09:02:50 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Dec 5 09:02:50 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../cql3/operations/PreparedOperation.java         |    4 +
 .../cassandra/cql3/statements/UpdateStatement.java |   99 ++++++---------
 3 files changed, 45 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


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