Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Java 8 for CSIT jobs."
[releng/builder.git]
/
jjb-templates
/
merge.yaml
diff --git
a/jjb-templates/merge.yaml
b/jjb-templates/merge.yaml
index db400f33f620e628370a072c620888d6aee9bfd3..98a81d5bcaba233294ea04e76f57473e2c3aa2cd 100644
(file)
--- a/
jjb-templates/merge.yaml
+++ b/
jjb-templates/merge.yaml
@@
-55,7
+55,7
@@
maven:
maven-name: '{mvn33}'
root-pom: 'POM'
- goals: 'MAVEN_GOALS -Dmerge -Dstream={stream}'
+ goals: 'MAVEN_GOALS -D
jenkins -D
merge -Dstream={stream}'
maven-opts: 'MAVEN_OPTS'
settings: '{JENKINS_SETTINGS}'
global-settings: '{odl-global-settings}'