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/85098de2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85098de2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85098de2 Branch: refs/heads/trunk Commit: 85098de2fdd64fb5ad930d6339dacceb206bca0e Parents: f207869 e5e2910 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Aug 7 14:19:44 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Aug 7 14:19:44 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/partitions/AbstractThreadUnsafePartition.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ----------------------------------------------------------------------