tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,092 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
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
Daniel Nephin e4e802d1f8 Merge pull request #1213 from moysesb/relative_build 
Make value of 'build:' relative to the yml file.
(cherry picked from commit 0f70b8638f)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-01 11:00:48 -04:00