Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b053af2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b053af2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b053af2d Branch: refs/heads/trunk Commit: b053af2da8e84be5c8900f0312bbe1677ef6a8df Parents: 2ae4163 bf0328f Author: Jason Brown <[email protected]> Authored: Wed Jul 8 14:14:40 2015 -0700 Committer: Jason Brown <[email protected]> Committed: Wed Jul 8 14:14:40 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 2 +- .../operations/InsertUpdateIfCondition.java | 861 ------------------- .../operations/InsertUpdateIfConditionTest.java | 861 +++++++++++++++++++ 4 files changed, 863 insertions(+), 862 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b053af2d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b053af2d/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
