Code Review
/
docs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
combined
(merge:
d7aa61e
6218fef
)
Merge "Adding faas docs"
author
Colin Dixon
<colin@colindixon.com>
Tue, 6 Sep 2016 16:20:18 +0000
(16:20 +0000)
committer
Gerrit Code Review
<gerrit@opendaylight.org>
Tue, 6 Sep 2016 16:20:18 +0000
(16:20 +0000)
1
2
manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
patch
|
diff1
|
diff2
|
blob
|
history
manuals/user-guide/src/main/asciidoc/bk-user-guide.adoc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
index 17f42a7651c5cfb24c87c05e37faea3b0cbfd50e,42595b08c382cff5c981c173f3be788505a7e76d..53ff3d3e5a3af041a638dc616943d1779baaeac0
---
1
/
manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
---
2
/
manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
+++ b/
manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
@@@
-104,10
-104,10
+104,12
@@@
include::packetcable/packetcable-dev.ad
// commenting this out as it contains no content
//include::reservation/reservation-dev.adoc[]
+ include::faas/odl-faas-dev.adoc[]
+
include::sfc/sfc.adoc[]
+include::snbi/odl-snbi-dev.adoc[]
+
include::snmp4sdn/snmp4sdn-developer.adoc[SNMP4SDN]
include::sxp/odl-sxp-dev.adoc[]
diff --cc
manuals/user-guide/src/main/asciidoc/bk-user-guide.adoc
Simple merge