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/bc784668 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc784668 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc784668 Branch: refs/heads/trunk Commit: bc7846680e82b2c728adbc1f35e11c09c659dd33 Parents: 5bdf318 5a5d0a1 Author: Benedict Elliott Smith <bened...@vast.com> Authored: Wed May 18 21:51:57 2016 +0100 Committer: Benedict Elliott Smith <bened...@vast.com> Committed: Wed May 18 21:51:57 2016 +0100 ---------------------------------------------------------------------- .../apache/cassandra/db/ColumnFamilyStore.java | 41 +++++++++----------- 1 file changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc784668/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
