Merge multi-value options when extending #1226
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
compose/config.py
Outdated
There was a problem hiding this comment.
Minor: this might be easier to read as:
already_merged_keys = set(['environment', 'volumes'] + list_keys + list_or_string_keys)
for k in set(ALLOWED_KEYS) - already_merged_keys:
...
|
LGTM |
aanand
force-pushed
the
merge-multi-value-options
branch
from
ba75eb2 to
cb67b85
Compare
Closes docker#1143. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
aanand
force-pushed
the
merge-multi-value-options
branch
from
cb67b85 to
907918b
Compare
aanand
added a commit
that referenced
this pull request
Mar 31, 2015
Merge multi-value options when extending
This was referenced Mar 31, 2015
aanand
added a commit
to aanand/fig
that referenced
this pull request
Apr 1, 2015
Merge multi-value options when extending (cherry picked from commit e708f4f)
aanand
added a commit
to aanand/fig
that referenced
this pull request
Apr 1, 2015
Merge multi-value options when extending (cherry picked from commit e708f4f) Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
yuval-k
pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
Merge multi-value options when extending Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
yuval-k
pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
Merge multi-value options when extending Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
StefanScherer
added a commit
to hypriot/compose
that referenced
this pull request
Apr 19, 2015
* tag '1.2.0': (46 commits) Bump 1.2.0 Merge pull request docker#1278 from albers/completion-run-user Merge pull request docker#1261 from aanand/fix-vars-in-volume-paths Merge pull request docker#1202 from aanand/jenkins-script Merge pull request docker#1213 from moysesb/relative_build Merge pull request docker#1226 from aanand/merge-multi-value-options Merge pull request docker#1225 from aanand/fix-1222 Fix regression in Dns and DnsSearch settings Fix volume merging when there's no explicit host path Fix service dict merging when only one dict has a volumes key Update docker-py and requests version ranges Revert "Remove restriction for requests version, update docker-py requirement" Revert "Use dev version of Docker" Revert "Add 'labels:' config option" Add 'labels:' config option Use dev version of Docker Make volume host paths relative to file, merge volumes when extending Implement `extends` Specify all HostConfig at create time Add build status \o/ ... Conflicts: Dockerfile README.md script/build-linux
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1143.