What git diff options do I use so that the jenkins build is happy? -Jordan
On April 17, 2015 at 11:41:11 AM, Apache Jenkins Server (jenk...@builds.apache.org) wrote: Jira: https://issues.apache.org/jira/browse/ZOOKEEPER-2163 Build: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/2637/ ################################################################################### ########################## LAST 60 LINES OF THE CONSOLE ########################### [...truncated 307 lines...] [exec] File to patch: [exec] Skip this patch? [y] [exec] Skipping patch. [exec] 2 out of 2 hunks ignored [exec] PATCH APPLICATION FAILED [exec] [exec] [exec] [exec] [exec] -1 overall. Here are the results of testing the latest attachment [exec] http://issues.apache.org/jira/secure/attachment/12726187/zookeeper-2163.patch [exec] against trunk revision 1672934. [exec] [exec] +1 @author. The patch does not contain any @author tags. [exec] [exec] +1 tests included. The patch appears to include 2 new or modified tests. [exec] [exec] -1 patch. The patch command could not apply the patch. [exec] [exec] Console output: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/2637//console [exec] [exec] This message is automatically generated. [exec] [exec] [exec] ====================================================================== [exec] ====================================================================== [exec] Adding comment to Jira. [exec] ====================================================================== [exec] ====================================================================== [exec] [exec] [exec] Comment added. [exec] 37664f9b1cf973af65d9756bc9a75afefce5671f logged out [exec] [exec] [exec] ====================================================================== [exec] ====================================================================== [exec] Finished build. [exec] ====================================================================== [exec] ====================================================================== [exec] [exec] BUILD FAILED /home/jenkins/jenkins-slave/workspace/PreCommit-ZOOKEEPER-Build/trunk/build.xml:1721: exec returned: 1 Total time: 44 seconds Build step 'Execute shell' marked build as failure Archiving artifacts Sending artifact delta relative to PreCommit-ZOOKEEPER-Build #2635 Archived 1 artifacts Archive block size is 32768 Received 0 blocks and 60638 bytes Compression is 0.0% Took 4.5 sec Recording test results Description set: ZOOKEEPER-2163 Email was triggered for: Failure Sending email for trigger: Failure ################################################################################### ############################## FAILED TESTS (if any) ############################## No tests ran.
