Skip to content

add sctp docs - #6078

Merged
gbarr01 merged 1 commit into
docker:vnext-enginefrom
AkihiroSuda:sctp
Apr 11, 2018
Merged

add sctp docs#6078
gbarr01 merged 1 commit into
docker:vnext-enginefrom
AkihiroSuda:sctp

Conversation

@AkihiroSuda

@AkihiroSuda AkihiroSuda commented Feb 26, 2018

Copy link
Copy Markdown
Contributor

Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

Proposed changes

part of #6039

@thaJeztah @ishidawataru

Unreleased project version (optional)

18.03

Related issues (optional)

#6039
docker/cli#900

@AkihiroSuda AkihiroSuda mentioned this pull request Feb 26, 2018
Closed
@thaJeztah

thaJeztah commented Feb 26, 2018

Copy link
Copy Markdown
Member

oh, can you open this against the vnext-engine branch? https://github.com/docker/docker.github.io/tree/vnext-engine That way it'll go out when 18.03 is released, and not before that 🤗

@thaJeztah thaJeztah added the area/engine Issue affects Docker engine/daemon label Feb 26, 2018
@thaJeztah thaJeztah added this to the engine/18.03 milestone Feb 26, 2018
@AkihiroSuda
AkihiroSuda changed the base branch from master to vnext-engine February 26, 2018 11:02
@AkihiroSuda
AkihiroSuda changed the base branch from vnext-engine to master February 26, 2018 11:02
@AkihiroSuda
AkihiroSuda changed the base branch from master to vnext-engine February 26, 2018 11:26
@AkihiroSuda

AkihiroSuda commented Feb 26, 2018

Copy link
Copy Markdown
Contributor Author

done

thaJeztah
thaJeztah approved these changes Feb 26, 2018
View reviewed changes

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah mentioned this pull request Mar 6, 2018
Closed
@gbarr01 gbarr01 self-assigned this Mar 15, 2018
@gbarr01

gbarr01 commented Mar 15, 2018

Copy link
Copy Markdown
Contributor

Thanks for all the work here @AkihiroSuda .... but I have some concerns. @thaJeztah @joaofnfernandes, questions:

  • The changes to _config.yml are already out of date. I think only Docs should edit this file?
  • Should't the YAML be edited on the docker-ce or docker-cli side? Because next Tuesday, I am going to clobber all the YAML files with those from docker-ce. So all of these changes will be clobbered.

Thoughts?

@joaofnfernandes

joaofnfernandes commented Mar 15, 2018

Copy link
Copy Markdown
Contributor

Oh... I think @AkihiroSuda updated the PR to be against vnext-engine but didn't rebase. That's why there are so many commits in this PR. Rebasing your branch to vnext-engine and pushing should solve all the conflicts and there are no changes to _config.yml.

@AkihiroSuda
add sctp docs
668f106 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
@AkihiroSuda

AkihiroSuda commented Mar 19, 2018

Copy link
Copy Markdown
Contributor Author

rebased

@gbarr01
gbarr01 merged commit c3f49f8 into docker:vnext-engine Apr 11, 2018
gbarr01 pushed a commit that referenced this pull request Apr 11, 2018
@AkihiroSuda @gbarr01
add sctp docs (#6078)
88eedbf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees

@gbarr01 gbarr01

Labels

area/engine Issue affects Docker engine/daemon

Projects

None yet

Milestone

engine/18.03

Development

Successfully merging this pull request may close these issues.

4 participants

@AkihiroSuda @thaJeztah @gbarr01 @joaofnfernandes