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
..
Dockerfile	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
docker-compose.yml	Merge pull request #1213 from moysesb/relative_build	2015-04-01 11:00:48 -04:00