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

Bump 1.6.0 rc2 #2753

Closed
wants to merge 471 commits into from
Closed

Bump 1.6.0 rc2 #2753

wants to merge 471 commits into from

Conversation

aanand
Copy link

@aanand aanand commented Jan 26, 2016

Do not merge.

aanand and others added 30 commits November 25, 2015 15:16
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <[email protected]>
Signed-off-by: Sven Dowideit <[email protected]>
We were essentially only testing that *at least one* of the invalid
values fails the validation check, rather than that *all* of them fail.

Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: Jonas Eckerström <[email protected]>
- The `raises` kwarg to the `cls_check` decorator was being used
  incorrectly (it should be an exception class, not an object).

- We need to check for `error.cause` and get the message out of the
  exception object.

NB: The particular case where validation fails in the case of `ports` is
only when ranges don't match in length - no further validation is
currently performed client-side.

Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: Daniel Nephin <[email protected]>
Signed-off-by: Daniel Nephin <[email protected]>
Signed-off-by: Daniel Nephin <[email protected]>
".yaml" is the preferred extension according to http://www.yaml.org/faq.html

Signed-off-by: jake-low <[email protected]>
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Cherry-pick release notes for 1.5.2
Stop warning about ".yaml" file extension
Removes the deprecated --allow-insecure-ssl flag
Signed-off-by: Aanand Prasad <[email protected]>
@shin-
Copy link

shin- commented Jan 27, 2016

Just needs a cherry-pick of #2761 - then LGTM.

shin- and others added 3 commits January 27, 2016 01:42
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: Aanand Prasad <[email protected]>
@aanand aanand changed the title Bump 1.6.0 rc2 Bump 1.6.0 Jan 27, 2016
@aanand aanand changed the title Bump 1.6.0 Bump 1.6.0 rc2 Jan 27, 2016
@aanand aanand closed this Jan 27, 2016
@aanand aanand deleted the bump-1.6.0-rc2 branch January 27, 2016 13:32
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.