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 0AD0D11DF3 for ; Thu, 31 Jul 2014 05:50:01 +0000 (UTC) Received: (qmail 37279 invoked by uid 500); 31 Jul 2014 05:50:00 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 37212 invoked by uid 500); 31 Jul 2014 05:50:00 -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 36988 invoked by uid 99); 31 Jul 2014 05:50:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jul 2014 05:50:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 128B69BB08E; Thu, 31 Jul 2014 05:50:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Thu, 31 Jul 2014 05:50:05 -0000 Message-Id: <0f596e78bbcd4dd1a3ceddff9ff79cc5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] 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/a88c7e10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a88c7e10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a88c7e10 Branch: refs/heads/trunk Commit: a88c7e10f360c599d39fafa01d9dcc85f6f41cf0 Parents: 45968e5 40d7bdf Author: Marcus Eriksson Authored: Thu Jul 31 07:47:47 2014 +0200 Committer: Marcus Eriksson Committed: Thu Jul 31 07:47:47 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamily.java | 4 ++-- .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java | 4 ++-- src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c7e10/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c7e10/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------