You can't have 2 drivers with the same name. That's really a bug but I'm not here to fix that now!
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/8c01c62b Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8c01c62b Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8c01c62b Branch: refs/heads/trunk Commit: 8c01c62b25312bbecf10ce87ce03109c1980f5b4 Parents: c5edd3a Author: anthony-shaw <[email protected]> Authored: Sun Jan 3 21:44:30 2016 +1100 Committer: anthony-shaw <[email protected]> Committed: Sun Jan 3 21:44:30 2016 +1100 ---------------------------------------------------------------------- docs/container/_supported_methods.rst | 6 +++--- docs/container/_supported_providers.rst | 4 ++-- libcloud/container/drivers/joyent.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/8c01c62b/docs/container/_supported_methods.rst ---------------------------------------------------------------------- diff --git a/docs/container/_supported_methods.rst b/docs/container/_supported_methods.rst index a62a8e5..ea52dfc 100644 --- a/docs/container/_supported_methods.rst +++ b/docs/container/_supported_methods.rst @@ -4,10 +4,10 @@ Provider install image list images deploy container get container start container stop container restart container destroy container list containers list locations create cluster destroy cluster list clusters =================================== ============= =========== ================ ============= =============== ============== ================= ================= =============== ============== ============== =============== ============= `Docker`_ yes yes yes yes yes yes yes yes yes no no no no -`Amazon Elastic Container Service`_ yes yes yes yes yes yes yes yes yes no yes yes yes -`Joyent`_ yes yes yes yes yes yes yes yes yes no no no no +`Amazon Elastic Container Service`_ no no yes yes yes yes yes yes yes no yes yes yes +`Joyent Triton`_ yes yes yes yes yes yes yes yes yes no no no no =================================== ============= =========== ================ ============= =============== ============== ================= ================= =============== ============== ============== =============== ============= .. _`Docker`: http://docker.io .. _`Amazon Elastic Container Service`: https://aws.amazon.com/ecs/details/ -.. _`Joyent`: http://joyent.com +.. _`Joyent Triton`: http://joyent.com http://git-wip-us.apache.org/repos/asf/libcloud/blob/8c01c62b/docs/container/_supported_providers.rst ---------------------------------------------------------------------- diff --git a/docs/container/_supported_providers.rst b/docs/container/_supported_providers.rst index 114af32..ebf4d82 100644 --- a/docs/container/_supported_providers.rst +++ b/docs/container/_supported_providers.rst @@ -5,9 +5,9 @@ Provider Documentation Pro =================================== ======================================== ================= ======================================== =============================== `Docker`_ :doc:`Click </container/drivers/docker>` DOCKER :mod:`libcloud.container.drivers.docker` :class:`DockerContainerDriver` `Amazon Elastic Container Service`_ :doc:`Click </container/drivers/ecs>` ECS :mod:`libcloud.container.drivers.ecs` :class:`ElasticContainerDriver` -`Joyent`_ :doc:`Click </container/drivers/joyent>` JOYENT :mod:`libcloud.container.drivers.joyent` :class:`JoyentContainerDriver` +`Joyent Triton`_ :doc:`Click </container/drivers/joyent>` JOYENT :mod:`libcloud.container.drivers.joyent` :class:`JoyentContainerDriver` =================================== ======================================== ================= ======================================== =============================== .. _`Docker`: http://docker.io .. _`Amazon Elastic Container Service`: https://aws.amazon.com/ecs/details/ -.. _`Joyent`: http://joyent.com +.. _`Joyent Triton`: http://joyent.com http://git-wip-us.apache.org/repos/asf/libcloud/blob/8c01c62b/libcloud/container/drivers/joyent.py ---------------------------------------------------------------------- diff --git a/libcloud/container/drivers/joyent.py b/libcloud/container/drivers/joyent.py index e380f6a..39df019 100644 --- a/libcloud/container/drivers/joyent.py +++ b/libcloud/container/drivers/joyent.py @@ -31,7 +31,7 @@ class JoyentContainerDriver(DockerContainerDriver): """ type = Provider.JOYENT - name = 'Joyent' + name = 'Joyent Triton' website = 'http://joyent.com' connectionCls = DockerConnection supports_clusters = False
