Merge "Update Dublin release note on S3P" into dublin

diff --git a/docs/release/index.rst b/docs/release/index.rst
index 68e8577..0683e06 100644 (file)
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -27,15 +27,8 @@ The Dublin 4.0.0 is the first release for Dublin.
 
 Project Specific Release Notes
 ==============================
-ONAP releases are specified by a list of project artifact versions in a :ref:`manifest artifacts <doc-release-manifest-artifacts>`
-and :ref:`manifest dockers <doc-release-manifest-docker>`.
-
-.. toctree::
-   :hidden:
-
-   release-manifest-docker.rst
-   release-manifest.rst
-
+ONAP releases are specified by a list of project artifact versions in the project repositories and 
+docker container image versions listed in the OOM helm charts.
 Each project provides detailed :ref:`release notes<doc-releaserepos>`
 and prepends to these if/when any updated versions the project team believes
 are compatible with a major release are made available.

diff --git a/docs/release/release-manifest-docker.rst b/docs/release/release-manifest-docker.rst
deleted file mode 100644 (file)
index eea2965..0000000
--- a/docs/release/release-manifest-docker.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.  http://creativecommons.org/licenses/by/4.0Copyright 2017 AT&T Intellectual Property.  All rights reserved.
-
-.. contents::
-   :depth: 3
-
-.. index:: Release Manifest - Docker
-
-.. _doc-release-manifest-docker:
-
-Release Manifest - Docker
--------------------------
-
-Docker Released Images  nexus3.onap.org
-+++++++++++++++++++++++++++++++++++++++
-
-.. csv-table::
-   :align: left
-   :header-rows: 1
-   :widths: 100, 100
-   :file: ../submodules/integration.git/version-manifest/src/main/resources/docker-manifest.csv

diff --git a/docs/release/release-manifest.rst b/docs/release/release-manifest.rst
deleted file mode 100644 (file)
index 84eda42..0000000
--- a/docs/release/release-manifest.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License. http://creativecommons.org/licenses/by/4.0 Copyright 2017 AT&T Intellectual Property.  All rights reserved.
-
-.. contents::
-   :depth: 3
-
-.. index:: Release Manifest - Artifacts
-
-.. _doc-release-manifest-artifacts:
-
-Release Manifest - Artifacts
-----------------------------
-
-Nexus Released Artifacts nexus.onap.org
-+++++++++++++++++++++++++++++++++++++++
-
-.. csv-table::
-   :align: left
-   :header-rows: 1
-   :file: ../submodules/integration.git/version-manifest/src/main/resources/java-manifest.csv

diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git
index 4125ca9..0cf3ff1 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit 4125ca99b260edccdb8f6ee073b959bfdfdf2e28
+Subproject commit 0cf3ff1b37069360d09bd5fcab57d9dab51202a3

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index ea33042..e3f8059 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit ea330420432c22b5f5768bdddffd920af11d3f5a
+Subproject commit e3f80591ed1f83df13a5fd4593dafb0160ff2aa2

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index d8be60a..6c95f7b 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit d8be60a550e5638ee95730dfd6d77a7a66e71c17
+Subproject commit 6c95f7b807b544c96185ef0788ce87e795e1fbc5

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index eaa1b41..cb7c5f2 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit eaa1b419edcc5bdffaa102642866e694d498f377
+Subproject commit cb7c5f2a4400515fa920f6dda0d8aa06603389d5