You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by br...@apache.org on 2012/03/28 19:05:40 UTC

[3/13] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

Merge branch 'cassandra-1.1.0' into cassandra-1.1


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

Branch: refs/heads/trunk
Commit: 5086eef2095147407b49bf45e84365e424ed5a79
Parents: 14e44db 2b44e54
Author: Brandon Williams <br...@apache.org>
Authored: Wed Mar 28 12:05:06 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Mar 28 12:05:06 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/cql/QueryProcessor.java   |   20 +++++++++++++-
 .../cassandra/cql3/statements/DeleteStatement.java |    1 +
 .../cassandra/cql3/statements/UpdateStatement.java |   12 +++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5086eef2/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5086eef2/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
----------------------------------------------------------------------