aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-05-29 14:08:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-29 14:08:34 +0000
commit23701b001275581b8b21bb82e4e9f8b7f4ebc56b (patch)
tree810ede15c709edb4d44a319e02ccb7c4e055b1fb
parent475090f0d7a679b8c223a225c16eb858cbc7d82d (diff)
parent42a4bc6d587ae5c980632de0e0805aecd0456235 (diff)
Merge "Move api out of the docs directory"
-rw-r--r--api/Makefile (renamed from docs/api/Makefile)0
-rw-r--r--api/_static/.gitkeep (renamed from docs/api/_static/.gitkeep)0
-rw-r--r--api/_templates/.gitkeep (renamed from docs/api/_templates/.gitkeep)0
-rw-r--r--api/apidoc/functest.core.feature.rst (renamed from docs/api/apidoc/functest.core.feature.rst)0
-rw-r--r--api/apidoc/functest.core.rst (renamed from docs/api/apidoc/functest.core.rst)0
-rw-r--r--api/apidoc/functest.core.testcase.rst (renamed from docs/api/apidoc/functest.core.testcase.rst)0
-rw-r--r--api/apidoc/functest.core.unit.rst (renamed from docs/api/apidoc/functest.core.unit.rst)0
-rw-r--r--api/apidoc/functest.core.vnf.rst (renamed from docs/api/apidoc/functest.core.vnf.rst)0
-rw-r--r--api/apidoc/functest.opnfv_tests.rst (renamed from docs/api/apidoc/functest.opnfv_tests.rst)0
-rw-r--r--api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst (renamed from docs/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst)0
-rw-r--r--api/apidoc/functest.opnfv_tests.sdn.odl.rst (renamed from docs/api/apidoc/functest.opnfv_tests.sdn.odl.rst)0
-rw-r--r--api/apidoc/functest.opnfv_tests.sdn.rst (renamed from docs/api/apidoc/functest.opnfv_tests.sdn.rst)0
-rw-r--r--api/apidoc/functest.rst (renamed from docs/api/apidoc/functest.rst)0
-rw-r--r--api/apidoc/modules.rst (renamed from docs/api/apidoc/modules.rst)0
-rw-r--r--api/conf.py (renamed from docs/api/conf.py)0
-rw-r--r--api/index.rst (renamed from docs/api/index.rst)0
-rw-r--r--tox.ini2
17 files changed, 1 insertions, 1 deletions
diff --git a/docs/api/Makefile b/api/Makefile
index ca9cfdc0..ca9cfdc0 100644
--- a/docs/api/Makefile
+++ b/api/Makefile
diff --git a/docs/api/_static/.gitkeep b/api/_static/.gitkeep
index e69de29b..e69de29b 100644
--- a/docs/api/_static/.gitkeep
+++ b/api/_static/.gitkeep
diff --git a/docs/api/_templates/.gitkeep b/api/_templates/.gitkeep
index e69de29b..e69de29b 100644
--- a/docs/api/_templates/.gitkeep
+++ b/api/_templates/.gitkeep
diff --git a/docs/api/apidoc/functest.core.feature.rst b/api/apidoc/functest.core.feature.rst
index a80e38da..a80e38da 100644
--- a/docs/api/apidoc/functest.core.feature.rst
+++ b/api/apidoc/functest.core.feature.rst
diff --git a/docs/api/apidoc/functest.core.rst b/api/apidoc/functest.core.rst
index 55c795be..55c795be 100644
--- a/docs/api/apidoc/functest.core.rst
+++ b/api/apidoc/functest.core.rst
diff --git a/docs/api/apidoc/functest.core.testcase.rst b/api/apidoc/functest.core.testcase.rst
index 2f947a1b..2f947a1b 100644
--- a/docs/api/apidoc/functest.core.testcase.rst
+++ b/api/apidoc/functest.core.testcase.rst
diff --git a/docs/api/apidoc/functest.core.unit.rst b/api/apidoc/functest.core.unit.rst
index 5dd6880e..5dd6880e 100644
--- a/docs/api/apidoc/functest.core.unit.rst
+++ b/api/apidoc/functest.core.unit.rst
diff --git a/docs/api/apidoc/functest.core.vnf.rst b/api/apidoc/functest.core.vnf.rst
index 9fd6b375..9fd6b375 100644
--- a/docs/api/apidoc/functest.core.vnf.rst
+++ b/api/apidoc/functest.core.vnf.rst
diff --git a/docs/api/apidoc/functest.opnfv_tests.rst b/api/apidoc/functest.opnfv_tests.rst
index 52c2d459..52c2d459 100644
--- a/docs/api/apidoc/functest.opnfv_tests.rst
+++ b/api/apidoc/functest.opnfv_tests.rst
diff --git a/docs/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst b/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst
index e6f8c736..e6f8c736 100644
--- a/docs/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst
+++ b/api/apidoc/functest.opnfv_tests.sdn.odl.odl.rst
diff --git a/docs/api/apidoc/functest.opnfv_tests.sdn.odl.rst b/api/apidoc/functest.opnfv_tests.sdn.odl.rst
index 60659a1e..60659a1e 100644
--- a/docs/api/apidoc/functest.opnfv_tests.sdn.odl.rst
+++ b/api/apidoc/functest.opnfv_tests.sdn.odl.rst
diff --git a/docs/api/apidoc/functest.opnfv_tests.sdn.rst b/api/apidoc/functest.opnfv_tests.sdn.rst
index ca8ae77d..ca8ae77d 100644
--- a/docs/api/apidoc/functest.opnfv_tests.sdn.rst
+++ b/api/apidoc/functest.opnfv_tests.sdn.rst
diff --git a/docs/api/apidoc/functest.rst b/api/apidoc/functest.rst
index 63860f8f..63860f8f 100644
--- a/docs/api/apidoc/functest.rst
+++ b/api/apidoc/functest.rst
diff --git a/docs/api/apidoc/modules.rst b/api/apidoc/modules.rst
index b8f33304..b8f33304 100644
--- a/docs/api/apidoc/modules.rst
+++ b/api/apidoc/modules.rst
diff --git a/docs/api/conf.py b/api/conf.py
index 746a90fe..746a90fe 100644
--- a/docs/api/conf.py
+++ b/api/conf.py
diff --git a/docs/api/index.rst b/api/index.rst
index db223437..db223437 100644
--- a/docs/api/index.rst
+++ b/api/index.rst
diff --git a/tox.ini b/tox.ini
index bde3a975..70059d11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ commands = nosetests --with-xunit \
[testenv:docs]
basepython = python2.7
-commands = sphinx-build -W -b html docs/api/ docs/api/_build
+commands = sphinx-build -W -b html api/ api/_build
[testenv:pep8]
basepython = python2.7