You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/06/14 14:35:36 UTC

[7/7] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: bdd8e8ade7914a6ab04297763b4329102f6fcfc9
Parents: b235218 a91219e
Author: Carl Yeksigian <ca...@apache.org>
Authored: Tue Jun 14 10:35:09 2016 -0400
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Tue Jun 14 10:35:09 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cql3/statements/DeleteStatement.java        |  15 ++-
 .../operations/InsertUpdateIfConditionTest.java | 120 ++++++++++++++++++-
 3 files changed, 128 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdd8e8ad/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
----------------------------------------------------------------------