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 "yaml file for bundle-based-reconciliaion script"
[releng/builder.git]
/
jjb
/
integration
/
integration-macros.yaml
diff --git
a/jjb/integration/integration-macros.yaml
b/jjb/integration/integration-macros.yaml
index 3933b0cd989e42049a612d199baf83f0da891530..366e4f2ec77b0347398df3477240d2b04e3325fb 100644
(file)
--- a/
jjb/integration/integration-macros.yaml
+++ b/
jjb/integration/integration-macros.yaml
@@
-17,7
+17,7
@@
- string:
name: KARAF_VERSION
default: '{karaf-version}'
- description: 'karaf3
or karaf4
, affects ODL deploy scripts'
+ description: 'karaf3
, karaf4, odl
, affects ODL deploy scripts'
- parameter:
name: integration-bundle-url