Vnext engine rebase#756
Vnext engine rebase#756mdlinville wants to merge 22 commits intodocker:masterfrom mdlinville:vnext-engine-rebase
Conversation
This branch will contain forward-looking Engine-specific docs and be the equivalent of docker/docker master for docs
These are new flags to service create/update being added in a Docker engine PR. Signed-off-by: Aaron Lehmann <[email protected]>
https://fedoramagazine.org/fedora-22-end-of-life-2016-july/ With the recent release of Fedora 24, Fedora 22 will officially enter End Of Life (EOL) status on July 19th, 2016. After July 19th, all packages in the Fedora 22 repositories will no longer receive security, bugfix, or enhancement updates, and no new packages will be added to the Fedora 22 collection. Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended for all users still running Fedora 22. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Updates the apparmor docs to reflect recent changes, specifically that we are no longer saving to /etc/apparmor.d/. Also removes the seccomp profile and instead links to the generating template. Signed-off-by: Christopher Jones <[email protected]>
Signed-off-by: French Ben <[email protected]>
Signed-off-by: French Ben <[email protected]>
Signed-off-by: French Ben <[email protected]>
Signed-off-by: French Ben <[email protected]>
Fixed incorrect statement about example layout Related to moby/moby#27918 Signed-off-by: Derek McGowan <[email protected]> (github: dmcgowan)
As of July 28, 2016, Ubuntu 15.10 is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html), and will receive no further updates. Support for 15.10 was removed in Docker 1.13 through moby/moby#27042 (moby/moby@e9a8105) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Support for Ubuntu 16.10 was added in moby/moby#27993 (moby/moby@27beb64) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Akira Koyasu <[email protected]>
When syncing docs from the docker/docker repository (e4bce35) some commits were not included. This includes those changes, by copying the documentation from moby/moby@8658748, which is the last commit before the docs were removed from the docker/docker repository in moby/moby@29f08cf Signed-off-by: Sebastiaan van Stijn <[email protected]>
* Create logentries.md Signed-off-by: Carlos Alexandro Becker <[email protected]>
* Add NATS client as option for publishing container logs Signed-off-by: Waldemar Quevedo <[email protected]>
Fixes #528 Signed-off-by: Misty Stanley-Jones <[email protected]>
Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: French Ben <[email protected]>
|
Sounds good to me (as in, this will help with #606), but I don't know enough about the changes to be able to do a proper review. |
|
So, to review this, I recommend: I think this rebase is OK to do now since at the time 1.13 is released, the |
|
@thaJeztah pointed out that in order to preview the rebase, I needed to be comparing |
|
Deploy preview ready! Built with commit 421d359 |
mdlinville
left a comment
mdlinville
left a comment
There was a problem hiding this comment.
I think after the two commits I've added to the top of this, this is ready to be force-pushed. WDYT, @thaJeztah ?
|
BTW I think we can ignore the conflicts since we are not really going to merge this PR as-is. |
|
Where are we on this? We're holding up #606 which is a pretty critical PR. If you can ignore the conflicts, are we good to go? |
|
The force-push is done! Closing this now. |
10 participants
Describe the proposed changes
Rebase
vnext-engineon current state ofmaster@thaJeztah @johndmulhausen @bfirsh PTAL
I'll need to force-push this, the PR is here just FYI.