diff options
| author |   fuqiao <fuqiao@chinamobile.com> | 2017-03-31 13:52:17 +0800 |
|---|---|---|
| committer | fuqiao <fuqiao@chinamobile.com> | 2017-03-31 13:52:17 +0800 |
| commit | 573f866af10b6127a669d346e8f2c306f00d2ceb (patch) | |
| tree | 55dbb28925b87873720324e26649d8f4e08bc916 /docs/development/design | |
| parent | 08274b14ccc7531208693a9a09d8c9ab3bdf8b3b (diff) | |
Modify git conflict
Modify git conflict
JIRA: HA-28
Change-Id: I283a216b1f97ff9ee225ff9ee92f1e2049383fe3
Signed-off-by:fuqiao@chinamobile.com
Diffstat (limited to 'docs/development/design')
3 files changed, 0 insertions, 26 deletions
diff --git a/docs/development/design/OPNFV_HA_Guest_APIs-Base-Messaging-Layer.rst b/docs/development/design/OPNFV_HA_Guest_APIs-Base-Messaging-Layer.rst deleted file mode 100644 index ef82456..0000000 --- a/docs/development/design/OPNFV_HA_Guest_APIs-Base-Messaging-Layer.rst +++ /dev/null @@ -1,6 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> -========================================================= -OPNFV HA Guest APIs -- Base Host-to-Guest Messaging Layer -=========================================================
\ No newline at end of file diff --git a/docs/development/design/OPNFV_HA_Guest_APIs-Server-Group-Messaging_HLD.rst b/docs/development/design/OPNFV_HA_Guest_APIs-Server-Group-Messaging_HLD.rst deleted file mode 100644 index 59ca24e..0000000 --- a/docs/development/design/OPNFV_HA_Guest_APIs-Server-Group-Messaging_HLD.rst +++ /dev/null @@ -1,6 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> -============================================== -OPNFV HA Guest APIs -- Server Group Messaging -==============================================
\ No newline at end of file diff --git a/docs/development/design/index.rst b/docs/development/design/index.rst deleted file mode 100644 index e2d3241..0000000 --- a/docs/development/design/index.rst +++ /dev/null @@ -1,14 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> - -********************************* -OPNFV HA Guest APIs -********************************* - -.. toctree:: - :numbered: - :maxdepth: 2 - - OPNFV_HA_Guest_APIs-Base-Messaging-Layer.rst - OPNFV_HA_Guest_APIs-server-Group-messaging_HLD.rst |