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 D651E184EC for ; Wed, 3 Jun 2015 16:06:16 +0000 (UTC) Received: (qmail 9474 invoked by uid 500); 3 Jun 2015 16:06:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 9419 invoked by uid 500); 3 Jun 2015 16:06:15 -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 9066 invoked by uid 99); 3 Jun 2015 16:06:15 -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, 03 Jun 2015 16:06:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A04F2E0AA1; Wed, 3 Jun 2015 16:06:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Wed, 03 Jun 2015 16:06:20 -0000 Message-Id: <5679e197738c46abbd6f0f76e9b2f148@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34962c30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34962c30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34962c30 Branch: refs/heads/trunk Commit: 34962c300fe357283b066bd76dccf1ced55613e2 Parents: 0603af9 46ea040 Author: Benedict Elliott Smith Authored: Wed Jun 3 17:02:08 2015 +0100 Committer: Benedict Elliott Smith Committed: Wed Jun 3 17:02:08 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/SSTableSimpleUnsortedWriter.java | 19 +++++++++---- .../io/sstable/CQLSSTableWriterTest.java | 29 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/34962c30/CHANGES.txt ----------------------------------------------------------------------