Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Compose file reference for version 3 #921

Merged
merged 1 commit into from
Dec 16, 2016

Conversation

dnephin
Copy link
Contributor

@dnephin dnephin commented Dec 16, 2016

Re-doing #716 against vnext-engine

cc @londoncalling

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@londoncalling
Copy link
Contributor

LGTM @dnephin @aanand , merging

@londoncalling londoncalling merged commit 94a5093 into docker:vnext-engine Dec 16, 2016
@thaJeztah
Copy link
Member

This is going to be confusing if vnext-engine is making changes to the compose documentation (given that there's also a vnext-compose branch https://github.com/docker/docker.github.io/tree/vnext-compose)

Which branch is going to be leading?

@londoncalling
Copy link
Contributor

@thaJeztah you are right, this should have been merged into vnext-compose , we will fix it

@londoncalling
Copy link
Contributor

Reverting this PR and cherry-picking the original changes into vnext-compose instead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants