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 "Adding upstream dependencies into GBP clustering"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index c565907a66996370686aa8b5a4fa7bc24c37201c..73e7ddd190ff68dfad1377d227a238b99f6ad018 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-303,7
+303,6
@@
branch: '{branch}'
wrappers:
- - build-timeout
- integration-jclouds-controller-mininet:
controller-vms: 1
mininet-image: '{mininet-image}'
@@
-955,4
+954,3
@@
inclusion-flag: 'off'
display-table: true
format: csv
-