From: Jun (Nicolas) Hu Date: Fri, 30 Nov 2018 00:21:00 +0000 (+0000) Subject: Merge "Add integration documentation" X-Git-Tag: elalto.1.5.2~8146 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=575336621c6f7587b2b2dfd71a493731d310ad4d;hp=dc50d244efc6955945234b6f08b8df0778ed9a34;p=doc.git Merge "Add integration documentation" --- diff --git a/.gitmodules b/.gitmodules index 8bed23836..89b53d4af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -363,3 +363,13 @@ url = ../logging-analytics/pomba/pomba-audit-common branch = . ignore = dirty +[submodule "docs/submodules/integration/benchmark.git"] + path = docs/submodules/integration/benchmark.git + url = ../integration/benchmark + branch = . + ignore = dirty +[submodule "docs/submodules/oparent/cia.git"] + path = docs/submodules/oparent/cia.git + url = ../oparent/cia + branch = . + ignore = dirty diff --git a/docs/guides/onap-user/index.rst b/docs/guides/onap-user/index.rst index c7c9c7ac2..5592194ff 100644 --- a/docs/guides/onap-user/index.rst +++ b/docs/guides/onap-user/index.rst @@ -18,3 +18,4 @@ an instance of ONAP. servicedesigner.rst servicecreator.rst onapadmin.rst + Verified Use Cases <../../submodules/integration.git/docs/docs_usecases.rst> diff --git a/docs/release/releaserepos.rst b/docs/release/releaserepos.rst index 06094d937..74170900b 100644 --- a/docs/release/releaserepos.rst +++ b/docs/release/releaserepos.rst @@ -119,6 +119,8 @@ Integration :titlesonly: integration<../submodules/integration.git/docs/release-notes.rst> + oparent-cia<../submodules/oparent/cia.git/docs/release-notes.rst> + benchmarks<../submodules/integration/benchmark.git/docs/release-notes.rst> Logging Analytics ----------------- diff --git a/docs/submodules/integration/benchmark.git b/docs/submodules/integration/benchmark.git new file mode 160000 index 000000000..b469ddb04 --- /dev/null +++ b/docs/submodules/integration/benchmark.git @@ -0,0 +1 @@ +Subproject commit b469ddb046b2e826f382cef7e3d5eb683a7ae988 diff --git a/docs/submodules/oparent/cia.git b/docs/submodules/oparent/cia.git new file mode 160000 index 000000000..74a967282 --- /dev/null +++ b/docs/submodules/oparent/cia.git @@ -0,0 +1 @@ +Subproject commit 74a9672825fec9e87f2b431a76ceb0a4d3db276e