summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJun (Nicolas) Hu <jun.nicolas.hu@att.com>2018-11-30 01:46:31 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-30 01:46:31 +0000
commitccac9d60432f40bdc24e0bd885eae9c81f49eeb1 (patch)
tree25ee5f08c39ef4246f5f5db461a39ab95e6cc783 /docs
parent908f3159991c4260aa927aa33c1d3417dfe349a9 (diff)
parentce44c18f63b4068f9622573201959e03fe40435f (diff)
Merge "Add integration documentation" into casablanca
Diffstat (limited to 'docs')
-rw-r--r--docs/guides/onap-user/index.rst1
-rw-r--r--docs/release/releaserepos.rst2
m---------docs/submodules/integration/benchmark.git0
m---------docs/submodules/oparent/cia.git0
4 files changed, 3 insertions, 0 deletions
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 0ed4df181..d6ef24390 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
+Subproject b469ddb046b2e826f382cef7e3d5eb683a7ae98
diff --git a/docs/submodules/oparent/cia.git b/docs/submodules/oparent/cia.git
new file mode 160000
+Subproject 74a9672825fec9e87f2b431a76ceb0a4d3db276