Code Review
/
integration
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enable DIDM in odl-integration-all
[integration/distribution.git]
/
features-test
/
src
/
main
/
resources
/
features.xml
diff --git
a/features-test/src/main/resources/features.xml
b/features-test/src/main/resources/features.xml
index 0ee87f300025ebc52fbbdc255fb1625fcc131c7a..050cd60da5ee25023af846efeea073a077e8bfdc 100644
(file)
--- a/
features-test/src/main/resources/features.xml
+++ b/
features-test/src/main/resources/features.xml
@@
-81,6
+81,7
@@
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
<feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
+ <feature version='${didm.version}'>odl-didm-all</feature>
<feature version='${feature.dlux.version}'>odl-dlux-core</feature>
<feature version='${project.version}'>odl-distribution-version</feature>
<feature version='${feature.eman.version}'>odl-eman</feature>
<feature version='${feature.dlux.version}'>odl-dlux-core</feature>
<feature version='${project.version}'>odl-distribution-version</feature>
<feature version='${feature.eman.version}'>odl-eman</feature>
@@
-139,11
+140,6
@@
<!-- Please use alphabetical order for non-compatible features -->
<feature name='odl-integration-all' version='${project.version}'>
<feature version='${feature.alto.version}'>odl-alto-release</feature>
<!-- Please use alphabetical order for non-compatible features -->
<feature name='odl-integration-all' version='${project.version}'>
<feature version='${feature.alto.version}'>odl-alto-release</feature>
- <!-- Commented out, because DIDM brings in Li designed OpenFlowPlugin
- which leads to BindException.
- Also, DIDM merge jobs are currently failing.
- <feature version='${didm.version}'>odl-didm-all</feature>
- -->
<feature version='${feature.faas.version}'>odl-faas-base</feature>
<feature version='${feature.genius.version}'>odl-genius-rest</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
<feature version='${feature.faas.version}'>odl-faas-base</feature>
<feature version='${feature.genius.version}'>odl-genius-rest</feature>
<feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>