Commit 4868392
gdy
Merge branch 'master' of https://github.com/ProjectKaiser/pk-jenkins
# Conflicts:
# README.md
# src/main/java/com/projectkaiser/scm/jenkins/api/exceptions/EPKJExists.java
# src/main/java/com/projectkaiser/scm/jenkins/api/exceptions/EPKJNotFound.java
# src/main/java/com/projectkaiser/scm/jenkins/api/exceptions/EPKJenkinsException.java
# src/main/java/com/projectkaiser/scm/jenkins/api/exceptions/EPKJenkinsServerException.java
# src/main/java/com/projectkaiser/scm/jenkins/data/Executable.java
# src/main/java/com/projectkaiser/scm/jenkins/data/JobListElement.java
# src/main/java/com/projectkaiser/scm/jenkins/data/QueueItem.java
# src/test/resources/com/projectkaiser/scm/jenkins/api/TestJob.xml1 file changed
+1
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| 49 | + | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| |||
0 commit comments