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/44838920 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44838920 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44838920 Branch: refs/heads/trunk Commit: 44838920709e0333ec105c299fa8cbb1f0905f93 Parents: 5382f4e 723a143 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Tue Jun 21 16:33:12 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Tue Jun 21 16:33:25 2016 +0200 ---------------------------------------------------------------------- .../operations/InsertUpdateIfConditionTest.java | 290 +++++++++++++++++++ 1 file changed, 290 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44838920/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java ----------------------------------------------------------------------
