Return-Path: X-Original-To: apmail-builds-archive@minotaur.apache.org Delivered-To: apmail-builds-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FB4618FC2 for ; Mon, 20 Jul 2015 14:01:20 +0000 (UTC) Received: (qmail 76834 invoked by uid 500); 20 Jul 2015 14:01:04 -0000 Delivered-To: apmail-builds-archive@apache.org Received: (qmail 76751 invoked by uid 500); 20 Jul 2015 14:01:04 -0000 Mailing-List: contact builds-help@apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: builds@apache.org Delivered-To: mailing list builds@apache.org Received: (qmail 76737 invoked by uid 99); 20 Jul 2015 14:01:04 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jul 2015 14:01:04 +0000 Date: Mon, 20 Jul 2015 14:01:04 +0000 (UTC) From: "Andrew Bayer (JIRA)" To: builds@apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Assigned] (BUILDS-99) Working copy in kafka Jenkins PR job needs merge MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/BUILDS-99?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Andrew Bayer reassigned BUILDS-99: ---------------------------------- Assignee: Andrew Bayer > Working copy in kafka Jenkins PR job needs merge > ------------------------------------------------ > > Key: BUILDS-99 > URL: https://issues.apache.org/jira/browse/BUILDS-99 > Project: Infra Build Platform > Issue Type: Task > Reporter: Ismael Juma > Assignee: Andrew Bayer > > All builds are failing because the working copy has an unresolved conflict. For example: > https://builds.apache.org/job/kafka-trunk-git-pr/18/ > It would be good to fix the working copy, but even better would be to change the config so that this kind of issue doesn't happen again (if possible). > It seems like this issue was triggered by this pull request that tries to merge `trunk` into `0.8.1`: > https://github.com/apache/kafka/pull/42 > Seems like an accidental pull request. We can't close it and the author is unresponsive. Any chance you can close it? Or do I need to file a separate INFRA issue for that? > Thanks! -- This message was sent by Atlassian JIRA (v6.3.4#6332)