Julien Duponchelle ca4d09ea40 Merge branch 'master' into 2.0		2016-07-05 15:41:53 +02:00
..
resources	Merge branch '1.5' into 2.0	2016-06-07 10:56:55 +02:00
__init__.py	Merge branch 'master' into 2.0	2016-07-05 15:41:53 +02:00
docker_error.py	Raise an error if image is missing on compute	2016-06-07 15:34:04 +02:00
docker_vm.py	Merge branch 'master' into 2.0	2016-07-05 15:41:53 +02:00