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
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
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
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
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
c9de801094
Merge pull request #5206 from SvenDowideit/stage-markdown
...
move the documentation to markdown
Upstream-commit: ede9ea37c39d52b12bb7d773070fa73219505f10
Component: engine
2014-04-16 10:08:57 +10:00
0bb55ea3f4
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: )
Upstream-commit: 936a03bfddb24cd45f5f12c20a961bf2ae6ede93
Component: engine
2014-04-16 00:02:10 +00:00
0a38627cf3
Fixing typos
...
Docker-DCO-1.1-Signed-off-by: Dan McPherson <dmcphers@redhat.com > (github: danmcp)
Upstream-commit: dceea17805258520b1218eb1a2bb394c8b9c0a03
Component: engine
2014-04-15 18:06:48 -04:00
d4a731f106
Adding myself to the MAINTAINERS file.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 32d8b5da5080cf4ef9f27636d1ee52c8b79eb890
Component: engine
2014-04-16 00:33:14 +03:00
388b678ba2
Merge pull request #5211 from crosbymichael/update-cgroup-defaults
...
Ignore not exist errors for joining default subsystems
Upstream-commit: 80f6b011328ad81fdf68d073b4dc771ec21cba23
Component: engine
2014-04-15 22:55:26 +03:00
ede836d1af
Merge pull request #5201 from tianon/build-busybox
...
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
Upstream-commit: 994b7eaeb736c745442cae84126e30fa079e3dfe
Component: engine
2014-04-15 09:47:05 -06:00
57da9f5a5d
Merge pull request #5181 from uggedal/mkimage-alpine
...
contrib: mkimage script for alpine linux
Upstream-commit: de167a75145a52f2099cab342c237c191b7db478
Component: engine
2014-04-15 08:09:42 -06:00
32c2479f3c
Merge pull request #5202 from vieux/allow_dot_repo
...
Allow dot in repo name
Upstream-commit: 8b54e57fa81b55d0fd42935505734719a348d6cf
Component: engine
2014-04-15 13:58:33 +03:00
80f4de5d30
contrib: mkimage script for alpine linux
...
Docker-DCO-1.1-Signed-off-by: Eivind Uggedal <eivind@uggedal.com > (github: uggedal)
Upstream-commit: 6a2bdc6eb769ffd1d8438f321953dde8b341b783
Component: engine
2014-04-15 07:59:42 +00:00
680490e66c
allow dot in repo name
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: d61fce9af770f0adaf4f178a5217dd46a02dd201
Component: engine
2014-04-14 23:15:38 +00:00
abb1fb2274
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7bb72fa080d13c3b90d624cb77530632c7705c56
Component: engine
2014-04-14 13:35:54 -06:00
2355a3647b
Merge pull request #5158 from vieux/refactor_build_only_configFile
...
refactor build job to know only configFile
Upstream-commit: e5ad715e5964bc64e098070d1ca72b110c337d1a
Component: engine
2014-04-14 10:59:48 -07:00
feaba75b7b
Merge pull request #5075 from tianon/update-check-config
...
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Upstream-commit: 19ffc5e92f5ddfc197890b0bc6a51187d0fd1916
Component: engine
2014-04-14 10:58:00 -07:00
