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 B30C8200CBB for ; Tue, 4 Jul 2017 19:58:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B14C9161C0F; Tue, 4 Jul 2017 17:58:27 +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 04CA3161C0E for ; Tue, 4 Jul 2017 19:58:26 +0200 (CEST) Received: (qmail 64656 invoked by uid 500); 4 Jul 2017 17:58:26 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 64469 invoked by uid 99); 4 Jul 2017 17:58:26 -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; Tue, 04 Jul 2017 17:58:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E85A9DFA3B; Tue, 4 Jul 2017 17:58:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Date: Tue, 04 Jul 2017 17:58:25 -0000 Message-Id: <5b9c5cf74589404982eeb0986d90f043@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] lucene-solr:branch_7_0: SOLR-10878: Fix precommit. archived-at: Tue, 04 Jul 2017 17:58:27 -0000 Repository: lucene-solr Updated Branches: refs/heads/branch_7_0 b73e8e5ef -> 174d55f41 SOLR-10878: Fix precommit. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/174d55f4 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/174d55f4 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/174d55f4 Branch: refs/heads/branch_7_0 Commit: 174d55f41486b5bc30661d116e1119abfcc30ba3 Parents: a32ba2c Author: Andrzej Bialecki Authored: Tue Jul 4 19:46:10 2017 +0200 Committer: Andrzej Bialecki Committed: Tue Jul 4 19:58:14 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/solr/cloud/MoveReplicaCmd.java | 1 - .../org/apache/solr/cloud/MoveReplicaHDFSTest.java | 16 ++++++++++++++++ .../test/org/apache/solr/cloud/MoveReplicaTest.java | 1 - 3 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/174d55f4/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java index 53d05e1..4d6e26d 100644 --- a/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java +++ b/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java @@ -31,7 +31,6 @@ import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.ZkNodeProps; -import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.params.CoreAdminParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.Utils; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/174d55f4/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java index 884d49e..dc6318b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.solr.cloud; import com.carrotsearch.randomizedtesting.ThreadFilter; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/174d55f4/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java index 8f00431..930e8ee 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java @@ -35,7 +35,6 @@ import org.apache.solr.client.solrj.response.RequestStatusState; import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Slice; -import org.apache.solr.common.cloud.ZkStateReader; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger;