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

cloud/docker/docker.py

@@ -1188,13 +1188,7 @@ class DockerManager(object):
                   'name':         self.module.params.get('name'),
                   'stdin_open':   self.module.params.get('stdin_open'),
                   'tty':          self.module.params.get('tty'),
-                  'volumes_from': self.module.params.get('volumes_from'),
                   }
-        if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0:
-            params['volumes_from'] = ""
-
-        if params['volumes_from'] is not None:
-            self.ensure_capability('volumes_from')
 
         def do_create(count, params):
             results = []