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
Revert "Comment NIC project in distribution"
[integration/distribution.git]
/
artifacts
/
upstream
/
feature-repos
/
pom.xml
diff --git
a/artifacts/upstream/feature-repos/pom.xml
b/artifacts/upstream/feature-repos/pom.xml
index ec9e4b5abe07808f97bb6607caec63157c128628..bf458900964d6256cce0a9bf1e2c02811f20a5fd 100644
(file)
--- a/
artifacts/upstream/feature-repos/pom.xml
+++ b/
artifacts/upstream/feature-repos/pom.xml
@@
-63,6
+63,7
@@
<!-- BIER -->
+ <!-- Comment due to fail merge job
<dependency>
<groupId>org.opendaylight.bier</groupId>
<artifactId>features-bier</artifactId>
@@
-70,6
+71,7
@@
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ -->
<!-- Controller -->
<dependency>