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 5D7DF17A1F for ; Thu, 9 Oct 2014 12:35:45 +0000 (UTC) Received: (qmail 43684 invoked by uid 500); 9 Oct 2014 12:35:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43584 invoked by uid 500); 9 Oct 2014 12:35:45 -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 43556 invoked by uid 99); 9 Oct 2014 12:35:45 -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, 09 Oct 2014 12:35:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C4EB9995EFF; Thu, 9 Oct 2014 12:35:44 +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: Thu, 09 Oct 2014 12:35:46 -0000 Message-Id: <89db5a6907244bb7b699baa186d2a0ae@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/a9bad890 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9bad890 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9bad890 Branch: refs/heads/trunk Commit: a9bad890fede3fee534c9fd94340d960caf86b1c Parents: 2fe5b9a 5a33a9a Author: Aleksey Yeschenko Authored: Thu Oct 9 15:35:37 2014 +0300 Committer: Aleksey Yeschenko Committed: Thu Oct 9 15:35:37 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 2 ++ .../org/apache/cassandra/db/DataTracker.java | 7 +++++ .../notifications/TruncationNotification.java | 32 ++++++++++++++++++++ 4 files changed, 42 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9bad890/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9bad890/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------