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 C902418503 for ; Fri, 6 Nov 2015 00:13:50 +0000 (UTC) Received: (qmail 11976 invoked by uid 500); 6 Nov 2015 00:13:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11901 invoked by uid 500); 6 Nov 2015 00:13:50 -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 11746 invoked by uid 99); 6 Nov 2015 00:13:50 -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; Fri, 06 Nov 2015 00:13:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 29E39E56E9; Fri, 6 Nov 2015 00:13:50 +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: Fri, 06 Nov 2015 00:13:53 -0000 Message-Id: <15d311219730400c88a30446f7f053af@git.apache.org> In-Reply-To: <6274abb008704a6e906018a236cbd440@git.apache.org> References: <6274abb008704a6e906018a236cbd440@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f189d11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f189d11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f189d11 Branch: refs/heads/trunk Commit: 8f189d1107b354cb1e820f0e4593712e0faee8c7 Parents: 746e9e4 cc4d759 Author: Aleksey Yeschenko Authored: Fri Nov 6 00:13:40 2015 +0000 Committer: Aleksey Yeschenko Committed: Fri Nov 6 00:13:40 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/SizeEstimatesRecorder.java | 5 +++-- .../org/apache/cassandra/db/SystemKeyspace.java | 16 ---------------- .../apache/cassandra/service/StorageService.java | 5 +---- 4 files changed, 5 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f189d11/CHANGES.txt ----------------------------------------------------------------------