diff options
| author |   CNlucius <lukai1@huawei.com> | 2016-08-11 20:39:50 +0800 |
|---|---|---|
| committer | CNlucius <lukai1@huawei.com> | 2016-08-11 20:41:42 +0800 |
| commit | 930ea9762123eed05c9f824aed6a132f986f126f (patch) | |
| tree | e62925819b7d243d294887d99626d28839f38f03 /docs/Colorado/scenario description/scenario-description.rst | |
| parent | 42ee46b5f6f8e85a8967733ad142438f923adaa8 (diff) | |
DOCS-84
ONOSFW contribution to the Colorado user guide
Change-Id: I16dcc5f02e1024de35db9a4a85bdf491f36b4309
Signed-off-by: CNlucius <lukai1@huawei.com>
Diffstat (limited to 'docs/Colorado/scenario description/scenario-description.rst')
| -rw-r--r-- | docs/Colorado/scenario description/scenario-description.rst | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/Colorado/scenario description/scenario-description.rst b/docs/Colorado/scenario description/scenario-description.rst index fc76eb3f..e94dd89f 100644 --- a/docs/Colorado/scenario description/scenario-description.rst +++ b/docs/Colorado/scenario description/scenario-description.rst @@ -1,5 +1,5 @@ ========================================= -OPNFV Brahmaputra release note for onosfw +OPNFV Colorado release note for onosfw ========================================= .. contents:: Table of Contents @@ -14,7 +14,11 @@ This document describes the testing scenario of onosfw project, including ONOS b License ======= -OPNFV Brahmaputra release note for onosfw Docs +<<<<<<< HEAD:docs/Colorado/scenario description/scenario-description.rst +OPNFV Colorado release note for onosfw Docs +======= +OPNFV Colorado release note for onosfw Docs +>>>>>>> 061216d... DOCS-84:docs/Colorado/scenario description/scenario-description.rst (c) by Lucius (HUAWEI) OPNFV Colorado release note for onosfw Docs @@ -29,7 +33,7 @@ Version history | **Date** | **Ver.** | **Author** | **Comment** | | | | | | +------------+----------+------------+------------------+ -| 2016-02-14 | 0.0.1 | Henry | First draft | +| 2016-08-11 | 0.0.1 | Lucius | First draft | | | | (HUAWEI) | | +------------+----------+------------+------------------+ |