Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8acb2a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8acb2a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8acb2a1 Branch: refs/heads/trunk Commit: a8acb2a1ba42426ec60d53a5564c6572cd37a6e9 Parents: c09ba58 8883554 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Mon Dec 12 13:54:05 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Mon Dec 12 13:56:07 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/a8acb2a1/CHANGES.txt ----------------------------------------------------------------------
