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 63EB1200CAC for ; Mon, 19 Jun 2017 08:37:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 62BC0160BE4; Mon, 19 Jun 2017 06:37:51 +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 A9709160BE1 for ; Mon, 19 Jun 2017 08:37:50 +0200 (CEST) Received: (qmail 65112 invoked by uid 500); 19 Jun 2017 06:37:49 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 65101 invoked by uid 99); 19 Jun 2017 06:37:49 -0000 Received: from crius.apache.org (HELO crius.apache.org) (140.211.11.14) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2017 06:37:49 +0000 Received: from crius.apache.org (localhost [127.0.0.1]) by crius.apache.org (ASF Mail Server at crius.apache.org) with ESMTP id 812199C0069 for ; Mon, 19 Jun 2017 06:37:47 +0000 (UTC) Date: Mon, 19 Jun 2017 06:37:46 +0000 (UTC) From: Apache Jenkins Server To: dev@zookeeper.apache.org Message-ID: <605969065.2287.1497854268530.JavaMail.jenkins@crius> In-Reply-To: <95648024.2156.1497823457714.JavaMail.jenkins@crius> References: <95648024.2156.1497823457714.JavaMail.jenkins@crius> Subject: Failed: ZOOKEEPER- PreCommit Build #800 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2286_1115500778.1497854266363" X-Jenkins-Job: PreCommit-ZOOKEEPER-github-pr-build X-Jenkins-Result: FAILURE archived-at: Mon, 19 Jun 2017 06:37:51 -0000 ------=_Part_2286_1115500778.1497854266363 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Build: https://builds.apache.org/job/PreCommit-ZOOKEEPER-github-pr-build/800/ ################################################################################### ########################## LAST 60 LINES OF THE CONSOLE ########################### [...truncated 1.56 KB...] stdout: Auto-merging src/java/main/org/apache/zookeeper/server/ZKDatabase.java CONFLICT (content): Merge conflict in src/java/main/org/apache/zookeeper/server/ZKDatabase.java Automatic merge failed; fix conflicts and then commit the result. stderr: hudson.plugins.git.GitException: Command "git merge f35af8b0128211df01816488404a80ffbdd1c4e0" returned status code 1: stdout: Auto-merging src/java/main/org/apache/zookeeper/server/ZKDatabase.java CONFLICT (content): Merge conflict in src/java/main/org/apache/zookeeper/server/ZKDatabase.java Automatic merge failed; fix conflicts and then commit the result. stderr: at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1903) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1871) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1867) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1512) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:621) at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:71) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:895) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:870) at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:829) at hudson.remoting.UserRequest.perform(UserRequest.java:153) at hudson.remoting.UserRequest.perform(UserRequest.java:50) at hudson.remoting.Request$2.run(Request.java:336) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) at ......remote call to H7(Native Method) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1545) at hudson.remoting.UserResponse.retrieve(UserRequest.java:253) at hudson.remoting.Channel.call(Channel.java:830) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:257) at com.sun.proxy.$Proxy103.merge(Unknown Source) at org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:435) at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107) at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1001) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1108) at hudson.scm.SCM.checkout(SCM.java:496) at hudson.model.AbstractProject.checkout(AbstractProject.java:1281) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:604) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529) at hudson.model.Run.execute(Run.java:1728) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43) at hudson.model.ResourceController.execute(ResourceController.java:98) at hudson.model.Executor.run(Executor.java:405) Archiving artifacts Recording test results ERROR: Step ?Publish JUnit test result report? failed: No test report files were found. Configuration error? [description-setter] Could not determine description. Putting comment on the pull request Email was triggered for: Failure - Any Sending email for trigger: Failure - Any ################################################################################### ############################## FAILED TESTS (if any) ############################## No tests ran. ------=_Part_2286_1115500778.1497854266363--