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 63ACE200C2F for ; Mon, 20 Feb 2017 01:19:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6250A160B72; Mon, 20 Feb 2017 00:19:37 +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 A7556160B63 for ; Mon, 20 Feb 2017 01:19:36 +0100 (CET) Received: (qmail 83047 invoked by uid 500); 20 Feb 2017 00:19:35 -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 83032 invoked by uid 99); 20 Feb 2017 00:19:35 -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; Mon, 20 Feb 2017 00:19:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A04CADFD6D; Mon, 20 Feb 2017 00:19:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markrmiller@apache.org To: commits@lucene.apache.org Date: Mon, 20 Feb 2017 00:19:35 -0000 Message-Id: <99cdae35b7bf4c8bb9d4d9b872d69edf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] lucene-solr:master: SOLR-10071: Add @AwaitsFix for now. archived-at: Mon, 20 Feb 2017 00:19:37 -0000 Repository: lucene-solr Updated Branches: refs/heads/master a9a6bf141 -> f45a3711b SOLR-10071: Add @AwaitsFix for now. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9533fa34 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9533fa34 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9533fa34 Branch: refs/heads/master Commit: 9533fa34f8b2882bbf15adecd05728072d86b1e9 Parents: a9a6bf1 Author: markrmiller Authored: Sun Feb 19 19:07:26 2017 -0500 Committer: markrmiller Committed: Sun Feb 19 19:07:26 2017 -0500 ---------------------------------------------------------------------- .../solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9533fa34/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java index 928f4d6..003a843 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.LuceneTestCase.Slow; -import org.apache.solr.SolrTestCaseJ4.SuppressSSL; +import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.impl.HttpSolrClient; @@ -43,8 +43,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Slow -@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776") @Nightly +@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10071") public class LeaderInitiatedRecoveryOnShardRestartTest extends AbstractFullDistribZkTestBase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());