Merge pull request #460 from dnephin/fix_tests_for_docker_1.1

Fix test failures on docker 1.1.2

fig/service.py

@@ -205,6 +205,10 @@ class Service(object):
             return tuples
 
     def recreate_container(self, container, **override_options):
+        """Recreate a container. An intermediate container is created so that
+        the new container has the same name, while still supporting
+        `volumes-from` the original container.
+        """
         try:
             container.stop()
         except APIError as e: