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
..
fixtures	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
integration	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
unit	Merge pull request #1489 from dnephin/faster_integration_tests	2015-07-14 17:28:54 +01:00
__init__.py	[pep8] flake8 run for everything, fix items from this change	2015-03-25 23:15:34 -07:00