Updated Branches: refs/heads/cassandra-1.0 270d0165d -> 281af5e4f refs/heads/cassandra-1.1 14e44db00 -> 5086eef20 refs/heads/cassandra-1.1.0 baf130094 -> 2b44e5460 refs/heads/trunk e09dd2aa6 -> e194915a8
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e194915a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e194915a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e194915a Branch: refs/heads/trunk Commit: e194915a8d4503070c828fef76dfd94f5c75a495 Parents: e09dd2a 5086eef Author: Brandon Williams <[email protected]> Authored: Wed Mar 28 12:05:30 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Mar 28 12:05:30 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/e194915a/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e194915a/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e194915a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ----------------------------------------------------------------------
