Merge "Reorganize docker-plugin for consistency"

2014-02-07 02:59:02 +00:00 · 2014-02-07 02:59:02 +00:00 · 4b8c063218
commit 4b8c063218
parent 6aee0f1e99 5acdabf81d
8 changed files with 1 additions and 1 deletions
--- a/contrib/docker_plugin/README.md
+++ b/contrib/docker_plugin/README.md
--- a/contrib/docker_plugin/init.py
+++ b/contrib/docker_plugin/init.py
--- a/contrib/docker_plugin/requirements.txt
+++ b/contrib/docker_plugin/requirements.txt
--- a/contrib/docker_plugin/resources/init.py
+++ b/contrib/docker_plugin/resources/init.py
--- a/contrib/docker_plugin/resources/docker_container.py
+++ b/contrib/docker_plugin/resources/docker_container.py
--- a/contrib/docker_plugin/tests/init.py
+++ b/contrib/docker_plugin/tests/init.py
--- a/contrib/docker_plugin/tests/fake_docker_client.py
+++ b/contrib/docker_plugin/tests/fake_docker_client.py
--- a/contrib/docker_plugin/tests/test_docker_container.py
+++ b/contrib/docker_plugin/tests/test_docker_container.py
@ -23,7 +23,7 @@ from heat.tests.common import HeatTestCase
 from heat.tests import utils

 from .fake_docker_client import FakeDockerClient  # noqa
-from ..plugin import docker_container  # noqa
+from ..resources import docker_container  # noqa


 template = '''