Toshio Kuratomi 45637176dc Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from ... Remove volumes_from altogether Conflicts: cloud/docker/docker.py		2015-03-13 13:42:40 -07:00
..
__init__.py	added __init__.py to new cloud subcategories so builds work again	2014-11-05 11:07:19 -05:00
docker.py	Merge branch 'volumes_from' of https://github.com/lorin/ansible-modules-core into lorin-volumes_from	2015-03-13 13:42:40 -07:00
docker_image.py	undeprecated docker_image until replacement actually arives	2015-02-23 12:43:10 -05:00