Aanand Prasad 4911c77134 Merge pull request #1489 from dnephin/faster_integration_tests ... Faster integration tests (cherry picked from commit 5231288b4e) Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> Conflicts: compose/cli/main.py		2015-07-14 17:28:54 +01:00
..
cli	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
__init__.py	Bump 1.3.1	2015-06-21 17:32:36 -07:00
config.py	Add security_opt as a docker-compose.yml option	2015-05-19 13:47:41 -04:00
const.py	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
container.py	Implement smart recreate behind an experimental CLI flag	2015-05-18 18:39:18 +01:00
legacy.py	Migrate containers in dependency order	2015-05-26 16:03:06 +01:00
progress_stream.py	Merge pull request #1464 from twhiteman/bug1461	2015-06-09 14:39:05 -04:00
project.py	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
service.py	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
state.py	Implement smart recreate behind an experimental CLI flag	2015-05-18 18:39:18 +01:00
utils.py	Remove whitespace from json hash	2015-05-20 16:02:08 +01:00