Merge branch 'development' into this feature branch

this is necessary to fix repeated test docs #553
threefoldtech · Jan 25, 2021 · 421c5f7 · 421c5f7
2 parents be84f4b + 4c8b7d9
commit 421c5f7
Show file tree

Hide file tree

Showing 10 changed files with 176 additions and 106 deletions.
diff --git a/docs/api/jumpscale/clients/base.html b/docs/api/jumpscale/clients/base.html
@@ -75,13 +75,13 @@ <h3>Ancestors</h3>
 </ul>
 <h3>Subclasses</h3>
 <ul class="hlist">
-<li><a title="jumpscale.clients.docker.docker.DockerClient" href="docker/docker.html#jumpscale.clients.docker.docker.DockerClient">DockerClient</a></li>
-<li><a title="jumpscale.clients.zdb.client.ZDBClient" href="zdb/client.html#jumpscale.clients.zdb.client.ZDBClient">ZDBClient</a></li>
-<li><a title="jumpscale.clients.redis.redis.RedisClient" href="redis/redis.html#jumpscale.clients.redis.redis.RedisClient">RedisClient</a></li>
-<li><a title="jumpscale.clients.sshclient.sshclient.SSHClient" href="sshclient/sshclient.html#jumpscale.clients.sshclient.sshclient.SSHClient">SSHClient</a></li>
 <li><a title="jumpscale.clients.git.git.GitClient" href="git/git.html#jumpscale.clients.git.git.GitClient">GitClient</a></li>
+<li><a title="jumpscale.clients.zdb.client.ZDBClient" href="zdb/client.html#jumpscale.clients.zdb.client.ZDBClient">ZDBClient</a></li>
 <li><a title="jumpscale.clients.gedis.gedis.GedisClient" href="gedis/gedis.html#jumpscale.clients.gedis.gedis.GedisClient">GedisClient</a></li>
 <li><a title="jumpscale.clients.sshkey.sshkey.SSHKeyClient" href="sshkey/sshkey.html#jumpscale.clients.sshkey.sshkey.SSHKeyClient">SSHKeyClient</a></li>
+<li><a title="jumpscale.clients.docker.docker.DockerClient" href="docker/docker.html#jumpscale.clients.docker.docker.DockerClient">DockerClient</a></li>
+<li><a title="jumpscale.clients.sshclient.sshclient.SSHClient" href="sshclient/sshclient.html#jumpscale.clients.sshclient.sshclient.SSHClient">SSHClient</a></li>
+<li><a title="jumpscale.clients.redis.redis.RedisClient" href="redis/redis.html#jumpscale.clients.redis.redis.RedisClient">RedisClient</a></li>
 </ul>
 <h3>Inherited members</h3>
 <ul class="hlist">
@@ -124,4 +124,4 @@ <h4><code><a title="jumpscale.clients.base.Client" href="#jumpscale.clients.base
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 <script>hljs.initHighlightingOnLoad()</script>
 </body>
-</html>
+</html>
diff --git a/docs/api/jumpscale/core/base/meta.html b/docs/api/jumpscale/core/base/meta.html
@@ -1044,11 +1044,11 @@ <h3>Subclasses</h3>
 <li><a title="jumpscale.tools.startupcmd.startupcmd.StartupCmd" href="../../tools/startupcmd/startupcmd.html#jumpscale.tools.startupcmd.startupcmd.StartupCmd">StartupCmd</a></li>
 <li><a title="jumpscale.clients.base.Client" href="../../clients/base.html#jumpscale.clients.base.Client">Client</a></li>
 <li><a title="jumpscale.servers.gedis.server.GedisServer" href="../../servers/gedis/server.html#jumpscale.servers.gedis.server.GedisServer">GedisServer</a></li>
-<li><a title="jumpscale.servers.gedis_http.GedisHTTPServer" href="../../servers/gedis_http/index.html#jumpscale.servers.gedis_http.GedisHTTPServer">GedisHTTPServer</a></li>
-<li><a title="jumpscale.servers.rack.rack.ServerRack" href="../../servers/rack/rack.html#jumpscale.servers.rack.rack.ServerRack">ServerRack</a></li>
 <li><a title="jumpscale.servers.openresty.location.Location" href="../../servers/openresty/location.html#jumpscale.servers.openresty.location.Location">Location</a></li>
 <li><a title="jumpscale.servers.openresty.server.Website" href="../../servers/openresty/server.html#jumpscale.servers.openresty.server.Website">Website</a></li>
 <li><a title="jumpscale.servers.openresty.server.OpenRestyServer" href="../../servers/openresty/server.html#jumpscale.servers.openresty.server.OpenRestyServer">OpenRestyServer</a></li>
+<li><a title="jumpscale.servers.rack.rack.ServerRack" href="../../servers/rack/rack.html#jumpscale.servers.rack.rack.ServerRack">ServerRack</a></li>
+<li><a title="jumpscale.servers.gedis_http.GedisHTTPServer" href="../../servers/gedis_http/index.html#jumpscale.servers.gedis_http.GedisHTTPServer">GedisHTTPServer</a></li>
 </ul>
 <h3>Static methods</h3>
 <dl>
@@ -1315,4 +1315,4 @@ <h4><code><a title="jumpscale.core.base.meta.BaseMeta" href="#jumpscale.core.bas
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 <script>hljs.initHighlightingOnLoad()</script>
 </body>
-</html>
+</html>
diff --git a/docs/api/jumpscale/data/bcdb/models/base.html b/docs/api/jumpscale/data/bcdb/models/base.html
@@ -444,12 +444,12 @@ <h3>Methods</h3>
 <h3>Subclasses</h3>
 <ul class="hlist">
 <li><a title="jumpscale.data.bcdb.models.model_model.ModelModel" href="model_model.html#jumpscale.data.bcdb.models.model_model.ModelModel">ModelModel</a></li>
-<li><a title="jumpscale.data.bcdb.models.user_model.UserModel" href="user_model.html#jumpscale.data.bcdb.models.user_model.UserModel">UserModel</a></li>
-<li><a title="jumpscale.data.bcdb.models.proj_model.ProjModel" href="proj_model.html#jumpscale.data.bcdb.models.proj_model.ProjModel">ProjModel</a></li>
 <li><a title="jumpscale.data.bcdb.models.test_model.TestModel" href="test_model.html#jumpscale.data.bcdb.models.test_model.TestModel">TestModel</a></li>
 <li><a title="jumpscale.data.bcdb.models.db_model.DBModel" href="db_model.html#jumpscale.data.bcdb.models.db_model.DBModel">DBModel</a></li>
 <li><a title="jumpscale.data.bcdb.models.post_model.QuoteModel" href="post_model.html#jumpscale.data.bcdb.models.post_model.QuoteModel">QuoteModel</a></li>
 <li><a title="jumpscale.data.bcdb.models.emplyee_model.EmployeeModel" href="emplyee_model.html#jumpscale.data.bcdb.models.emplyee_model.EmployeeModel">EmployeeModel</a></li>
+<li><a title="jumpscale.data.bcdb.models.user_model.UserModel" href="user_model.html#jumpscale.data.bcdb.models.user_model.UserModel">UserModel</a></li>
+<li><a title="jumpscale.data.bcdb.models.proj_model.ProjModel" href="proj_model.html#jumpscale.data.bcdb.models.proj_model.ProjModel">ProjModel</a></li>
 </ul>
 <h3>Methods</h3>
 <dl>
@@ -784,4 +784,4 @@ <h4><code><a title="jumpscale.data.bcdb.models.base.ModelBase" href="#jumpscale.
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 <script>hljs.initHighlightingOnLoad()</script>
 </body>
-</html>
+</html>