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 4E460C835 for ; Fri, 19 Dec 2014 05:10:16 +0000 (UTC) Received: (qmail 86047 invoked by uid 500); 19 Dec 2014 05:10:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85939 invoked by uid 500); 19 Dec 2014 05:10: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 85910 invoked by uid 99); 19 Dec 2014 05:10:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 05:10:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 708C59CBCD8; Fri, 19 Dec 2014 05:10:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Fri, 19 Dec 2014 05:10:17 -0000 Message-Id: <48e3d2425b284401a8da7682e994979c@git.apache.org> In-Reply-To: <779240d99c4946559bac6899f9160b14@git.apache.org> References: <779240d99c4946559bac6899f9160b14@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/2f072f4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f072f4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f072f4d Branch: refs/heads/trunk Commit: 2f072f4d8be0d591a66b0e0c5a9f55a9ecc42088 Parents: 507b6c0 a7edaa5 Author: Yuki Morishita Authored: Thu Dec 18 23:09:53 2014 -0600 Committer: Yuki Morishita Committed: Thu Dec 18 23:09:53 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f072f4d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f072f4d/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java ----------------------------------------------------------------------