Updated Branches: refs/heads/trunk 25b2a4275 -> 27e322b63
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/27e322b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27e322b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27e322b6 Branch: refs/heads/trunk Commit: 27e322b63776076d593a3b64aabd62bea304aca1 Parents: 25b2a42 27c999a Author: Sylvain Lebresne <[email protected]> Authored: Thu Mar 29 16:34:26 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Mar 29 16:34:26 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql/DeleteStatement.java | 7 ++++--- .../cassandra/cql3/statements/DeleteStatement.java | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27e322b6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27e322b6/src/java/org/apache/cassandra/cql/DeleteStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27e322b6/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java ----------------------------------------------------------------------
