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 30ECA18E36 for ; Wed, 19 Aug 2015 21:31:18 +0000 (UTC) Received: (qmail 67654 invoked by uid 500); 19 Aug 2015 21:31:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 67626 invoked by uid 500); 19 Aug 2015 21:31:14 -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 67539 invoked by uid 99); 19 Aug 2015 21:31:14 -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, 19 Aug 2015 21:31:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7DE2FE7D96; Wed, 19 Aug 2015 21:31:14 +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: Wed, 19 Aug 2015 21:31:15 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/6cad04b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cad04b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cad04b2 Branch: refs/heads/trunk Commit: 6cad04b220833e185e05aa229684ebbdc23f4212 Parents: b1c7f59 4cc2b67 Author: Aleksey Yeschenko Authored: Thu Aug 20 00:31:27 2015 +0300 Committer: Aleksey Yeschenko Committed: Thu Aug 20 00:31:27 2015 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- src/java/org/apache/cassandra/hints/HintsWriter.java | 7 ++++--- src/java/org/apache/cassandra/hints/LegacyHintsMigrator.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cad04b2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------