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 D920811404 for ; Mon, 8 Sep 2014 19:22:43 +0000 (UTC) Received: (qmail 49083 invoked by uid 500); 8 Sep 2014 19:22:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 48991 invoked by uid 500); 8 Sep 2014 19:22:43 -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 48630 invoked by uid 99); 8 Sep 2014 19:22:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Sep 2014 19:22:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8BD0AA0ECB4; Mon, 8 Sep 2014 19:22:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mishail@apache.org To: commits@cassandra.apache.org Date: Mon, 08 Sep 2014 19:22:51 -0000 Message-Id: <4cd135874fb84227a2b2851f98204fa4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92881598 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92881598 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92881598 Branch: refs/heads/trunk Commit: 9288159898605f8f160b040dab46be2c089b30c8 Parents: d641053 ad9f51f Author: Mikhail Stepura Authored: Mon Sep 8 12:21:36 2014 -0700 Committer: Mikhail Stepura Committed: Mon Sep 8 12:21:36 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92881598/CHANGES.txt ----------------------------------------------------------------------