9cb488d888
Merge pull request #5236 from crosbymichael/remove-ghost-networking
...
Remove ghost networking
Upstream-commit: c2df189ea57d6fc2ad2f769d88b740a56dfd4bd9
Component: engine
2014-04-18 20:38:12 +03:00
2282ad2b57
Merge pull request #5298 from SvenDowideit/remove-auto-markdown-conversion
...
Merged.
Upstream-commit: 3eea3e071478e51c984ca30a8235a331f9f6a91b
Component: engine
2014-04-18 14:13:36 +03:00
2a4849bb16
the markdown docs are now master, but I may do a manual conversion a few more times when older PR's are merged
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: d4a00c749440899c629a9f67b968295a4673c476
Component: engine
2014-04-18 16:34:53 +10:00
943cef11d2
Merge pull request #5275 from ostezer/docs-add-back-ga-code
...
Add back the GA code block.
Upstream-commit: 6df19aa78ee71faeb41471667d59b5ae6281e150
Component: engine
2014-04-17 22:44:48 -04:00
781079125d
Merge pull request #5274 from ostezer/docs-add-edit-on-github-link
...
Amendments providing the "Edit on GitHub" link for docs on master.
Upstream-commit: a0cfcbf6488e847fb47e993ba86eb318b47d0f31
Component: engine
2014-04-18 12:43:24 +10:00
0c4d4155fb
Merge pull request #5265 from ostezer/docs-fix-mobile-menu-click
...
Fix & improvements for mobile (& desktop) menu & submenu behaviour & issues.
Upstream-commit: 81d9d9243653cd0896e5224b4f426fc09c9e3906
Component: engine
2014-04-18 12:42:35 +10:00
9dec58c31c
Merge pull request #5257 from ostezer/docs-fix-toc-click
...
Fix for TOC "click/expand" & "scroll position" problem on mobile.
Upstream-commit: ac697e5f5206ae89fe78296aea6884a75dbea62d
Component: engine
2014-04-17 22:42:15 -04:00
7884c9309e
Merge pull request #5292 from ostezer/docs-fix-mkdocs-yaaaayml-file
...
Make things awesomer by amending mkdocs.yml
Upstream-commit: b84de10b85e5912a06cad66c4ba53b9c2bb0324b
Component: engine
2014-04-18 09:57:38 +10:00
6414dc6f78
Make things awesomer by amending mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: f3bf61fad427f81ecfede2728163626a009e8333
Component: engine
2014-04-18 02:51:04 +03:00
de47414003
Remove IsGhost checks around networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: eceeebc22d9e4d75630e333759895a868ceba234
Component: engine
2014-04-17 23:49:59 +00:00
e911aabe55
Merge pull request #5269 from ostezer/docs-improve-index-docs
...
Improve (&restructure) Docker Index docs on the Docker docs.
Upstream-commit: 6934f0fa9eae0f976d47ec8f0366f3a907d44b05
Component: engine
2014-04-18 09:25:54 +10:00
abf4ece9b5
Merge pull request #5287 from jamtur01/tickets/5283
...
Fixed #5283 - literal leftover from cutover
Upstream-commit: fb2110b465f0431a8271a9243693a8fddcf75a0f
Component: engine
2014-04-18 09:04:16 +10:00
88ed8dd5d7
Merge pull request #5284 from jamtur01/tickets/5282
...
Fixed #5282 - deprecated -name syntax
Upstream-commit: bb0262414569d9e5409357a69534cadd5809f70e
Component: engine
2014-04-18 09:03:55 +10:00
1bbbedd397
Fixed #5283 - literal leftover from cutover
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 2f3cb370dfaca1f1c41bbd7af5f064f70ad8267b
Component: engine
2014-04-17 18:58:02 -04:00
925af64a21
Merge pull request #5261 from ostezer/fix-inline-links
...
Fix for broken in-document links which got scrambled during conversion.
Upstream-commit: ad8db1aa22c2ee791ffc612e6b8dbd2b780f6070
Component: engine
2014-04-18 01:49:18 +03:00
a8735ae555
Merge pull request #5260 from ostezer/docs-remove-manual-tocs
...
Remove manually written TOCs from archived docs.
Upstream-commit: f34383ac7e4cd0beaeb7e69cb454114fff263adc
Component: engine
2014-04-18 08:43:27 +10:00
e5935bd923
Fixed #5282 - deprecated -name syntax
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a75758fcf648ed22fe979cbb625c209a92c5d873
Component: engine
2014-04-17 18:43:06 -04:00
ed0a050c76
Add back the GA code block.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: baa4f395511c6fd0dd41c89c627215116abd9741
Component: engine
2014-04-18 01:42:23 +03:00
a0cd3a514d
Merge pull request #5273 from alexlarsson/rename-runtime-to-daemon
...
Rename runtime/* to daemon/*
Upstream-commit: 58595475ea1c96472cc1ada4dfaed203f5ec86f6
Component: engine
2014-04-17 14:56:43 -07:00
cd920e0ff9
Amendments providing the "Edit on GitHub" link for docs on master.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 05d7271f91fd29fb75202913fa8caab5f7790718
Component: engine
2014-04-18 00:53:39 +03:00
f7be50364d
Rename runtime/* to daemon/*
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
2014-04-17 14:43:01 -07:00
34c3c0d881
Improve (&restructure) Docker Index docs on the Docker docs.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: cb6bcfd6bc1f71da324ca498dffda2c6c99e6090
Component: engine
2014-04-17 23:13:59 +03:00
97c42c7dba
Fix & improvements for mobile (& desktop) menu & submenu behaviour & issues.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 7f62f470f3dbe1ac67d3666681b7ce303af69995
Component: engine
2014-04-17 20:35:08 +03:00
4e25aa80e6
Fix for broken in-document links which got scrambled during conversion.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 1ff66d27b5b35b9782d6d6cdd5fc5ec95bdda07d
Component: engine
2014-04-17 18:09:08 +03:00
86ffd6a16e
Remove manually written TOCs from archived docs.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 24a42b1370380179c48f88a3d2d81faddda9cbcc
Component: engine
2014-04-17 17:47:34 +03:00
25ef1df5cf
Fix for TOC "click/expand" & "scroll position" problem on mobile.
...
Fixes:
- Click/expand
- Scroll pos.
- TOC table scroll-down arrow.
- TOC title scrolls to top.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 205e85da3211ed1600982ee1d189f1d070aa8b40
Component: engine
2014-04-17 15:48:03 +03:00
bcc50d4fa4
Merge pull request #5230 from huslage/master
...
Replacing ASCII art image with real diagram
Upstream-commit: 57cbe8b1060e28a365722341c52b1a8b69d368ba
Component: engine
2014-04-17 12:47:48 +10:00
f79805dbd1
Merge pull request #5248 from unclejack/more_info_testtop
...
provide more information when TestTop tests fail
Upstream-commit: 8e67197267891f8390b539b893ce786e0d481427
Component: engine
2014-04-16 18:54:04 -07:00
03781d62bc
simplify the docs branch process for now
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 65fb2e77eb8c5fdb419a94058f7b4630c00871af
Component: engine
2014-04-17 11:11:32 +10:00
480254b3ab
provide more information when TestTop tests fail
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 3ac90aeed5a6bdfe22af48eca1519fb186dc66cb
Component: engine
2014-04-17 03:39:15 +03:00
e8612e5df6
Merge pull request #5246 from crosbymichael/fix-mount
...
Fix unmount when host volume is removed
Upstream-commit: 925dfdb18a3298834358d659221135a903749be9
Component: engine
2014-04-16 17:28:37 -07:00
284604c1bf
Merge pull request #5215 from danmcp/fix_typos
...
Fixing typos
Upstream-commit: ef114930cddb17c5c782142dcad0e818323e7a23
Component: engine
2014-04-16 16:44:16 -07:00
014bce304c
Merge pull request #5234 from crosbymichael/refactor-container-start
...
Refactor container start
Upstream-commit: 2d6f537bb30d7d096dbde83cbf4df9fa7f6c5f57
Component: engine
2014-04-17 02:20:35 +03:00
497ecf2fc0
Merge pull request #5243 from creack/hairpin_nat_test
...
Add integration test for hairpin nat
Upstream-commit: 66480d67fb90a5e307936785e4aa78b51486ab93
Component: engine
2014-04-17 01:44:56 +03:00
a1a986e108
Merge pull request #5245 from SvenDowideit/more-working-with
...
this topic nolonger crashes the build
Upstream-commit: b92c86764a7265b569ea960eb9db666e73e77102
Component: engine
2014-04-17 01:44:50 +03:00
6ccec3eab2
this topic nolonger crashes the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 4ba7b28006620962ae8a0f6cb5865a5e1a65b332
Component: engine
2014-04-17 08:43:07 +10:00
85dd0db1d0
Merge pull request #5233 from ostezer/docs-fix-scroll-header-margin
...
Fix headers staying under the menu when clicked-to-scroll.
Upstream-commit: f85d03327d5180611d399ce5c8f2d545c11473aa
Component: engine
2014-04-17 08:40:55 +10:00
42e22eb4ac
Merge pull request #5231 from ostezer/fix-breadcrumbs
...
Amend breadcrumbs to link to the section indexes, i.e., home/:section/
Upstream-commit: 2f3cccfcbd8eb1ba70243373c91364bebbef50b0
Component: engine
2014-04-17 08:40:40 +10:00
c35b2bba93
Add integration test for hairpin nat
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 1775ed8c75fabb3544402ca13afe7a4c35b27038
Component: engine
2014-04-16 14:50:11 -07:00
6ce979b21a
Fix headers staying under the menu when clicked-to-scroll.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 882862b095fb0bf6b554c2b11123c608ff68025e
Component: engine
2014-04-16 19:38:08 +03:00
f628e86c9f
Replacing ASCII art image with real diagram
...
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: 75d97a4d2f446b5357341ea16f95be8f3215eecd
Component: engine
2014-04-16 11:24:07 -04:00
a746b7ee69
Amend breadcrumbs to link to the section indexes, i.e., home/section/
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: b74fa7587228361f2e13606c260f559b56aaf323
Component: engine
2014-04-16 18:20:29 +03:00
2ab96284b5
Merge pull request #5227 from SvenDowideit/fix-conversion-urls-securityblog
...
rst->md conversion fix
Upstream-commit: 24c4c3e0e99ddb4d65200f2f7367883e47008898
Component: engine
2014-04-16 13:11:29 +03:00
20f9c08a40
rst->md conversion fix
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: ce7d251d520443228d5058f4fa9185b2f7e7b075
Component: engine
2014-04-16 14:43:52 +10:00
927cbbfeb1
Merge pull request #5204 from ostezer/new-maintainer
...
Adding myself to the MAINTAINERS
Upstream-commit: 9b6c40cf69e048a5a23fc9a20b0fe7224d60d8ea
Component: engine
2014-04-15 21:19:39 -07:00
b169931da8
Merge pull request #5224 from dhrp/tp-titles-colors
...
Changed heading colors and some alignments (no longer center and justification in left column)
Upstream-commit: 8e35bb256d07bfa7e6374759baf9c081fe6a46a8
Component: engine
2014-04-16 13:07:52 +10:00
4d9a02a306
Changed heading colors and some alignments (no longer center and justification in left column)
...
Docker-DCO-1.1-Signed-off-by: Thatcher Peskens <thatcher@docker.com > (github: dhrp)
Upstream-commit: 4d3e448a33f87ed18def8f4ee7a01ef66bc6549e
Component: engine
2014-04-15 19:15:13 -07:00
a8d6e0c894
Merge pull request #5219 from dotcloud/master-doc-markdown
...
now, with shiney markdown
Upstream-commit: b9f66049fa4d0dc2cdc0a430fe14029214456611
Component: engine
2014-04-16 11:05:29 +10:00
c4684e29f0
now, with shiney markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: ac999a9cb2b0976e021aeb8825bb051df6bd0976
Component: engine
2014-04-16 11:04:14 +10:00
5c2b3f3f64
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a777ebcee6326bed2f7e99eedf6edbb922175e2d
Component: engine
2014-04-16 11:04:01 +10:00