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 2AE4817FF1 for ; Mon, 26 Jan 2015 22:45:33 +0000 (UTC) Received: (qmail 27132 invoked by uid 500); 26 Jan 2015 22:45:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 27025 invoked by uid 500); 26 Jan 2015 22:45:33 -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 26705 invoked by uid 99); 26 Jan 2015 22:45:33 -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; Mon, 26 Jan 2015 22:45:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CE2DE0833; Mon, 26 Jan 2015 22:45:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 26 Jan 2015 22:45:35 -0000 Message-Id: In-Reply-To: <602effb8426d42f1a8fc78e830c00a60@git.apache.org> References: <602effb8426d42f1a8fc78e830c00a60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra 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/0b08c994 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b08c994 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b08c994 Branch: refs/heads/trunk Commit: 0b08c994c199e372f8ac2cb7bf5fd3a216e14a25 Parents: 2e22bc9 33297ba Author: Aleksey Yeschenko Authored: Tue Jan 27 01:45:24 2015 +0300 Committer: Aleksey Yeschenko Committed: Tue Jan 27 01:45:24 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../cassandra/db/ArrayBackedSortedColumns.java | 54 +++++++------------- 2 files changed, 20 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b08c994/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b08c994/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java ----------------------------------------------------------------------