Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3DEE179DB for ; Wed, 16 Sep 2015 08:42:39 +0000 (UTC) Received: (qmail 77213 invoked by uid 500); 16 Sep 2015 08:42:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 77097 invoked by uid 500); 16 Sep 2015 08:42:39 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 76836 invoked by uid 99); 16 Sep 2015 08:42:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Sep 2015 08:42:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59FCBE0286; Wed, 16 Sep 2015 08:42:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Wed, 16 Sep 2015 08:42:41 -0000 Message-Id: <553b6e3c333d45e2a42cf1ba36d2fbac@git.apache.org> In-Reply-To: <95522ea722bd492d87be026c43360664@git.apache.org> References: <95522ea722bd492d87be026c43360664@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk 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/48da81dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48da81dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48da81dc Branch: refs/heads/trunk Commit: 48da81dc4b64e2a064016458ac924036d8fe21c4 Parents: 61ce1b9 c694cd6 Author: Sam Tunnicliffe Authored: Wed Sep 16 09:40:14 2015 +0100 Committer: Sam Tunnicliffe Committed: Wed Sep 16 09:40:14 2015 +0100 ---------------------------------------------------------------------- .../db/partitions/AtomicBTreePartition.java | 2 +- .../org/apache/cassandra/index/StubIndex.java | 14 ++++++---- .../index/internal/CustomIndexTest.java | 29 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 7 deletions(-) ----------------------------------------------------------------------