Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2851A200D5C for ; Fri, 1 Dec 2017 00:20:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 26B06160C04; Thu, 30 Nov 2017 23:20:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7565D160C01 for ; Fri, 1 Dec 2017 00:20:00 +0100 (CET) Received: (qmail 65976 invoked by uid 500); 30 Nov 2017 23:19:59 -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 65942 invoked by uid 99); 30 Nov 2017 23:19:59 -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; Thu, 30 Nov 2017 23:19:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D76EF6098; Thu, 30 Nov 2017 23:19:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulo@apache.org To: commits@cassandra.apache.org Date: Thu, 30 Nov 2017 23:20:00 -0000 Message-Id: In-Reply-To: <4e729e91afda41a48f26260c2f7d5500@git.apache.org> References: <4e729e91afda41a48f26260c2f7d5500@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: ninja: fix bad #14079 merge (Fix AbstractCompactionStrategyTest TableMetadataRef -> TableMetadata) archived-at: Thu, 30 Nov 2017 23:20:01 -0000 ninja: fix bad #14079 merge (Fix AbstractCompactionStrategyTest TableMetadataRef -> TableMetadata) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b244a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b244a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b244a1 Branch: refs/heads/trunk Commit: 88b244a1380c44d36861b6d0be9c78c968d292c2 Parents: f81e57e Author: Paulo Motta Authored: Fri Dec 1 10:13:59 2017 +1100 Committer: Paulo Motta Committed: Fri Dec 1 10:19:24 2017 +1100 ---------------------------------------------------------------------- .../cassandra/db/compaction/AbstractCompactionStrategyTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b244a1/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java index 481b394..b77589d 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AbstractCompactionStrategyTest.java @@ -134,7 +134,7 @@ public class AbstractCompactionStrategyTest long timestamp = System.currentTimeMillis(); DecoratedKey dk = Util.dk(String.format("%03d", key)); ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(table); - new RowUpdateBuilder(cfs.metadata, timestamp, dk.getKey()) + new RowUpdateBuilder(cfs.metadata(), timestamp, dk.getKey()) .clustering(String.valueOf(key)) .add("val", "val") .build() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org