You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/12/12 12:53:36 UTC
[4/4] cassandra git commit: Merge branch cassandra-3.11 into
cassandra-3.X
Merge branch cassandra-3.11 into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8883554a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8883554a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8883554a
Branch: refs/heads/cassandra-3.X
Commit: 8883554a1d58cb4fcf96b7e3c42cd6feca773e8a
Parents: 84b2e73 c80b9fb
Author: Benjamin Lerer <b....@gmail.com>
Authored: Mon Dec 12 13:52:46 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Dec 12 13:52:55 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../operations/InsertUpdateIfConditionTest.java | 125 +++++++++++--------
2 files changed, 76 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8883554a/CHANGES.txt
----------------------------------------------------------------------