Merge branch 'cassandra-3.X' into trunk

* cassandra-3.X:
  Make distinction between unset row and non-existing partition for LWTs


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

Branch: refs/heads/trunk
Commit: 894b4e20ed9cbf997d9511b48f09d4cab52fd421
Parents: 717e132 26339b3
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Thu Dec 8 17:28:10 2016 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Thu Dec 8 17:28:10 2016 +0100

----------------------------------------------------------------------
 .../cql3/statements/CQL3CasRequest.java         | 10 +++---
 .../cassandra/db/filter/ColumnFilter.java       |  9 ++++++
 .../operations/InsertUpdateIfConditionTest.java | 32 +++++++++++++++++++-
 3 files changed, 46 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


Reply via email to