aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-05-26 15:41:08 +0200
committerMorgan Richomme <morgan.richomme@orange.com>2020-06-10 12:59:08 +0000
commit03abcbe1f1b8bd7b348f1f921f5f1e6cf2ed5ac9 (patch)
treee3419f75de87da0e2803ae070a8c90544f77056e
parent1534046ce1a630b7b10e2c97b6bcc8c4808ef4df (diff)
Read the docs improvement for 5G - PNF Pre-Onboarding and Onboarding
Issue-ID: INT-1240 Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> Change-Id: I0c30ebfa9f55be3bea51bc5542eda4b648bf5c93 (cherry picked from commit 6294afdd6c55bf8236aefbb1c6e0b530aaf70c1c)
-rw-r--r--docs/docs_pnf_onboarding_preonboarding.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/docs_pnf_onboarding_preonboarding.rst b/docs/docs_pnf_onboarding_preonboarding.rst
index deb7c3e36..fb13276f5 100644
--- a/docs/docs_pnf_onboarding_preonboarding.rst
+++ b/docs/docs_pnf_onboarding_preonboarding.rst
@@ -25,3 +25,8 @@ How to Use
- PNF onboarding (SDC Resource Onboarding)
The onboarding step is mandatory in ONAP.
A vendor-provided PNF onboarding package must be onboarded according to procedure: `SDC Resource Onboarding <https://docs.onap.org/en/frankfurt/guides/onap-user/design/resource-onboarding/index.html>`_
+<<<<<<< HEAD (153404 Update helm and kubectl versions)
+=======
+
+
+>>>>>>> CHANGE (6294af Read the docs improvement for 5G - PNF Pre-Onboarding and On)