Merge "Create unique labels for "Service Design" pages and updated reference Issue...

diff --git a/.gitmodules b/.gitmodules
index f5c37bb..d78cf40 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -403,3 +403,8 @@
        url = ../modeling/genericparser
        branch = .
        ignore = dirty
+[submodule "docs/submodules/osa.git"]
+       path = docs/submodules/osa.git
+       url = ../osa/
+       branch = master
+       ignore = dirty

diff --git a/docs/guides/onap-developer/developing/index.rst b/docs/guides/onap-developer/developing/index.rst
index 4920187..13b22f9 100644 (file)
--- a/docs/guides/onap-developer/developing/index.rst
+++ b/docs/guides/onap-developer/developing/index.rst
@@ -246,6 +246,7 @@ Policy Framework
    :maxdepth: 2
    :titlesonly:
 
+   ../../../submodules/policy/parent.git/docs/index
    ../../../submodules/policy/engine.git/docs/index
    ../../../submodules/policy/apex-pdp.git/docs/index
    ../../../submodules/policy/distribution.git/docs/index

diff --git a/docs/release/releaserepos.rst b/docs/release/releaserepos.rst
index 4beabfe..f9ece9f 100644 (file)
--- a/docs/release/releaserepos.rst
+++ b/docs/release/releaserepos.rst
@@ -196,7 +196,7 @@ Policy Framework
    :maxdepth: 1
    :titlesonly:
 
-   policy<../submodules/policy/engine.git/docs/release-notes.rst>
+   policy<../submodules/policy/parent.git/docs/release-notes.rst>
 
 Portal Platform
 ---------------

diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst
index df0595c..a083e37 100644 (file)
--- a/docs/release/repolist.rst
+++ b/docs/release/repolist.rst
@@ -93,3 +93,4 @@ Project/Components
    ccsdk/features <../submodules/ccsdk/features.git/docs/index>
    parent <../submodules/parent.git/docs/index>
    modeling/genericparser <../submodules/modeling/genericparser.git/docs/index>
+   osa <../submodules/osa.git/docs/index>

diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git
index aab276e..2fedc6d 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit aab276e679f221b37fc6be37e5dd0ffd72ffc406
+Subproject commit 2fedc6d93206113e52f29fb84a721eb94ec0e177

diff --git a/docs/submodules/aai/aai-common.git b/docs/submodules/aai/aai-common.git
index f5edbe7..b0a3251 160000 (submodule)
--- a/docs/submodules/aai/aai-common.git
+++ b/docs/submodules/aai/aai-common.git
@@ -1 +1 @@
-Subproject commit f5edbe7b1b05609b200be74b18789ec9a8d272ae
+Subproject commit b0a32518159592219decbd34de1b51ee1e7a9bb6

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index 5c0ecef..bd1da0d 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit 5c0ecefc0b8f10fc8b1f65f57fd9fc064b9a112d
+Subproject commit bd1da0d90b12f36f2931e8b3dba4cfb63ef3442b

diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git
index 4565458..6919392 160000 (submodule)
--- a/docs/submodules/appc/deployment.git
+++ b/docs/submodules/appc/deployment.git
@@ -1 +1 @@
-Subproject commit 45654589fbd0bc7597a753cec14903b6b508f2f3
+Subproject commit 6919392881a94fa9823e5ebf8748682a4c499e98

diff --git a/docs/submodules/ccsdk/cds.git b/docs/submodules/ccsdk/cds.git
index 380a30e..b86fe0e 160000 (submodule)
--- a/docs/submodules/ccsdk/cds.git
+++ b/docs/submodules/ccsdk/cds.git
@@ -1 +1 @@
-Subproject commit 380a30ea374576cbda7bb00404f8b469e1ab5795
+Subproject commit b86fe0e27bc66ecae386007c1d751f82cbf920cd

diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git
index ef9aed4..ee36182 160000 (submodule)
--- a/docs/submodules/clamp.git
+++ b/docs/submodules/clamp.git
@@ -1 +1 @@
-Subproject commit ef9aed4b3a69128fa10feaa9ab787a57ef6772d7
+Subproject commit ee36182e63efee33a140f0a132bd0c75889d6e14

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index 9896786..4a8c1b6 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit 989678694e5960cb43ea5c0d37052b736b639423
+Subproject commit 4a8c1b6d692207917ee61cd14eba3f9f522a9bd5

diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git
index edaf8b1..d20ca31 160000 (submodule)
--- a/docs/submodules/dcaegen2.git
+++ b/docs/submodules/dcaegen2.git
@@ -1 +1 @@
-Subproject commit edaf8b1d69fa97862bd246dc61c1e4e77a01b5be
+Subproject commit d20ca31bb588ac665566df777363973257218819

diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git
index 3ebd253..52c5c5a 160000 (submodule)
--- a/docs/submodules/dmaap/datarouter.git
+++ b/docs/submodules/dmaap/datarouter.git
@@ -1 +1 @@
-Subproject commit 3ebd2534167e73426d2b19efb05eaf9892f6f9d6
+Subproject commit 52c5c5ab9ba33755e26f06f41de608f825866a53

diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git
index 822e3c8..bce9428 160000 (submodule)
--- a/docs/submodules/externalapi/nbi.git
+++ b/docs/submodules/externalapi/nbi.git
@@ -1 +1 @@
-Subproject commit 822e3c812b1b2abdd310de060a023081c48f69b5
+Subproject commit bce9428824803a9f2b03975c7238e52974ec31b2

diff --git a/docs/submodules/holmes/rule-management.git b/docs/submodules/holmes/rule-management.git
index 90b740e..dccfbfc 160000 (submodule)
--- a/docs/submodules/holmes/rule-management.git
+++ b/docs/submodules/holmes/rule-management.git
@@ -1 +1 @@
-Subproject commit 90b740e99be5e6ddb3bccc6f2840c707acf74f92
+Subproject commit dccfbfc62bf1548e49f6e2b4b100c717fc2736fd

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index d8d2be9..1f3c8d6 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit d8d2be9554c9ee55a7b1b35946f1ee516b41c8eb
+Subproject commit 1f3c8d6b67fcfdc0bcb95d3b283b232a4bb56cbb

diff --git a/docs/submodules/integration/devtool.git b/docs/submodules/integration/devtool.git
index f0f1a64..5a180c4 160000 (submodule)
--- a/docs/submodules/integration/devtool.git
+++ b/docs/submodules/integration/devtool.git
@@ -1 +1 @@
-Subproject commit f0f1a644ee5c8da2ee35cb78b8db67e3838121cb
+Subproject commit 5a180c4d5c0649b0b8a57782ef108f60e6049839

diff --git a/docs/submodules/logging-analytics.git b/docs/submodules/logging-analytics.git
index 592c36f..8ae641c 160000 (submodule)
--- a/docs/submodules/logging-analytics.git
+++ b/docs/submodules/logging-analytics.git
@@ -1 +1 @@
-Subproject commit 592c36f506b19ad2af2d16917fd079bd49e3b0ef
+Subproject commit 8ae641cab9b161d9c31f0287a4cfca0600f1d665

diff --git a/docs/submodules/logging-analytics/pomba/pomba-audit-common.git b/docs/submodules/logging-analytics/pomba/pomba-audit-common.git
index 40a3a65..27e1d60 160000 (submodule)
--- a/docs/submodules/logging-analytics/pomba/pomba-audit-common.git
+++ b/docs/submodules/logging-analytics/pomba/pomba-audit-common.git
@@ -1 +1 @@
-Subproject commit 40a3a65331c9a001b92be54e18ab5a27b9257bc4
+Subproject commit 27e1d60f2f01f01c6be4fad6cfde94b8effac3f8

diff --git a/docs/submodules/modeling/genericparser.git b/docs/submodules/modeling/genericparser.git
index b3fb8b6..33f10ed 160000 (submodule)
--- a/docs/submodules/modeling/genericparser.git
+++ b/docs/submodules/modeling/genericparser.git
@@ -1 +1 @@
-Subproject commit b3fb8b6f092622b00f7273ec6ff9f78c76208652
+Subproject commit 33f10edff6f3d3c4fece34ae67f08bd768f6e1c7

diff --git a/docs/submodules/modeling/modelspec.git b/docs/submodules/modeling/modelspec.git
index bbf1c74..8e9a0ae 160000 (submodule)
--- a/docs/submodules/modeling/modelspec.git
+++ b/docs/submodules/modeling/modelspec.git
@@ -1 +1 @@
-Subproject commit bbf1c746723814a7adbf94b5c6ce40ae86b83dd7
+Subproject commit 8e9a0ae49c06bf4fd2b0be4d79cae6bbb22eb91d

diff --git a/docs/submodules/multicloud/azure.git b/docs/submodules/multicloud/azure.git
index d69ada1..8ab92db 160000 (submodule)
--- a/docs/submodules/multicloud/azure.git
+++ b/docs/submodules/multicloud/azure.git
@@ -1 +1 @@
-Subproject commit d69ada1539f9d4bb716a723c1dad0c8c0b1c087d
+Subproject commit 8ab92dba524aacc4956497d72f6aa1b25ceb1adc

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index 8b38222..0566fc5 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit 8b38222e46064156985f0e6425207479fd2c975e
+Subproject commit 0566fc507f64578ab37c4bce1abaaad8d5528169

diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git
index 574eb96..a1fce42 160000 (submodule)
--- a/docs/submodules/multicloud/k8s.git
+++ b/docs/submodules/multicloud/k8s.git
@@ -1 +1 @@
-Subproject commit 574eb961e8651ba4e4f0f92d7984a2716e5e64f7
+Subproject commit a1fce42fe5280236f3968f257e224a42f2e4f781

diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git
index c89dd8b..e0375ce 160000 (submodule)
--- a/docs/submodules/oom.git
+++ b/docs/submodules/oom.git
@@ -1 +1 @@
-Subproject commit c89dd8b0e3f15a4aa56c4489349c56c6715e06bc
+Subproject commit e0375cee11a33922822bc9b92bcd4bdf3c6d5bcd

diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git
index b1fe785..6fdcd7d 160000 (submodule)
--- a/docs/submodules/oom/offline-installer.git
+++ b/docs/submodules/oom/offline-installer.git
@@ -1 +1 @@
-Subproject commit b1fe78553ea7d1caf90c1d52e195cd8f2a082008
+Subproject commit 6fdcd7d9bd8b4395180d8cbd6c6aa936e50dba76

diff --git a/docs/submodules/optf/osdf.git b/docs/submodules/optf/osdf.git
index b6d3f10..95bd3e4 160000 (submodule)
--- a/docs/submodules/optf/osdf.git
+++ b/docs/submodules/optf/osdf.git
@@ -1 +1 @@
-Subproject commit b6d3f10fa850af99edbf3476b465ae68902d8d11
+Subproject commit 95bd3e4710787de7488be24913f708cf539a577a

diff --git a/docs/submodules/osa.git b/docs/submodules/osa.git
new file mode 160000 (submodule)
index 0000000..6eae795
--- /dev/null
+++ b/docs/submodules/osa.git
@@ -0,0 +1 @@
+Subproject commit 6eae79527d8678a4db0599092caa159159862d23

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index e095073..2c533a5 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit e0950730de4543af8e3fd672e80feff540e6483d
+Subproject commit 2c533a581179c1c06c8811b6dda57e8a6d0fbd2c

diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git
index af35b6a..541f83b 160000 (submodule)
--- a/docs/submodules/policy/parent.git
+++ b/docs/submodules/policy/parent.git
@@ -1 +1 @@
-Subproject commit af35b6a245e1587a3f149746c043fc4520daecaa
+Subproject commit 541f83b8b97f1d3c33401e1cbe9436aa31d7fa76

diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git
index 5260297..ba546e9 160000 (submodule)
--- a/docs/submodules/portal.git
+++ b/docs/submodules/portal.git
@@ -1 +1 @@
-Subproject commit 5260297bb0fdd7ca1640b45a4c9b96b7fd158a1e
+Subproject commit ba546e970d779a5e87a07b3058a85e1446c39129

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index f3a1aa0..ddb67dc 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit f3a1aa08a8339ce312013154550c8e8b637f0fc3
+Subproject commit ddb67dc3cbb04f4857f2cf24221b306fa2bab052

diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git
index aa3351b..6b030f7 160000 (submodule)
--- a/docs/submodules/sdc/sdc-workflow-designer.git
+++ b/docs/submodules/sdc/sdc-workflow-designer.git
@@ -1 +1 @@
-Subproject commit aa3351b0197d96469dd1c34abd0489c09756eaa4
+Subproject commit 6b030f7063438153078563a3cf0f902c4aaafa55

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index e151fc7..6290f37 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit e151fc707c1426e2c8563726a8b396de0e0b65c9
+Subproject commit 6290f3775cdf1aa1eb2fc34f04cec10a8b1358a6

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index a716045..4b7ebd2 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit a7160456335b2ce3710efd00658711d431eac0b4
+Subproject commit 4b7ebd265366542ec872869e9ec0016a88e879b1

diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git
index 094dd68..4fa6adb 160000 (submodule)
--- a/docs/submodules/usecase-ui.git
+++ b/docs/submodules/usecase-ui.git
@@ -1 +1 @@
-Subproject commit 094dd6840bfa4cebc120b0735797ff3617371296
+Subproject commit 4fa6adb91b4a31cd26d24d834477a1fa94d2a83d

diff --git a/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git b/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
index 5fa5f4e..045656e 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
+++ b/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
@@ -1 +1 @@
-Subproject commit 5fa5f4e2afa00ee7287be0b7fda43228860b6537
+Subproject commit 045656e9d2178f5dfbc14061f4b3edd8e6d7fe1d

diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git
index 6af8ffa..83f5eaa 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/lcm.git
+++ b/docs/submodules/vfc/nfvo/lcm.git
@@ -1 +1 @@
-Subproject commit 6af8ffa7960ecba33fc78e03e116ec7fc67a74a9
+Subproject commit 83f5eaad87d82ecc398653f0fd8335ce8d1dbfe8

diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
index fcc997f..e3c3ba0 160000 (submodule)
--- a/docs/submodules/vid.git
+++ b/docs/submodules/vid.git
@@ -1 +1 @@
-Subproject commit fcc997f27346a5db7f7e69e8d2bfd42d2bbc4fa1
+Subproject commit e3c3ba0dc33afe638cd1cade06331b1c5d379295

diff --git a/docs/submodules/vnfrqts/requirements.git b/docs/submodules/vnfrqts/requirements.git
index 0531bd6..6441ccb 160000 (submodule)
--- a/docs/submodules/vnfrqts/requirements.git
+++ b/docs/submodules/vnfrqts/requirements.git
@@ -1 +1 @@
-Subproject commit 0531bd6bf390d8c23505326c4524496983419654
+Subproject commit 6441ccbf69a50f6ea5eff890962215c00b0eefdf

diff --git a/docs/submodules/vnfsdk/model.git b/docs/submodules/vnfsdk/model.git
index bc72d11..8663d8e 160000 (submodule)
--- a/docs/submodules/vnfsdk/model.git
+++ b/docs/submodules/vnfsdk/model.git
@@ -1 +1 @@
-Subproject commit bc72d112aa72968b21f8e7270e02510ff52d99a3
+Subproject commit 8663d8e7483d4f7f86433fa52dda404963b80a22