Merge pull request #58 from esben/master

Final changes before 0.2.0 release
XD-embedded · Aug 28, 2016 · 9be3e75 · 9be3e75
2 parents bf777be + a43bb22
commit 9be3e75
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,15 @@
-0.2.0 (in development)
+0.2.0 (2016-08-28)
 ----------------------
 * Add container_remove() method.
 * Add container_start() method.
+* Add container_wait() method.
+* Add container_stop() method.
+* Add container_restart() method.
+* Add container_kill() method.
+* Allow private registry image names.
+* Fixed handling of linked containers in containers().
+* Support DOCKER_HOST environment variable.
+* Add shell script to do manual testing.
 
 0.1.0 (2016-08-13)
 ------------------

diff --git a/README.rst b/README.rst
@@ -18,5 +18,4 @@ unit and integration tests in place.
 Documentation
 -------------
 
-Documentation will be hosted on http://readthedocs.org when I have finished
-the setup for that.
+Documentation is build with Sphinx, and is hosted on http://readthedocs.org
diff --git a/xd/docker/client.py b/xd/docker/client.py
@@ -580,6 +580,10 @@ def container_kill(self,
 
         Send signal to container, and (maybe) wait for the container to exit.
 
+        Note: Prior to Docker version 1.8, kill succeeds (without actually
+        doing anything) when run on existing but stopped containers.  Docker
+        1.8 and newer fails out with a ServerError exception.
+
         Arguments:
           container: The container to remove (id or name).
           signal: Signal to send to container.