Michael Crosby
1b76554adc
Squashed commit of the following:
...
commit 75af1649b063abbc5d662fd2f8bc4ff62c927687
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:32:42 2014 -0400
more refactor
commit 43b36d0f15d634497127bcb17dacaa70ae92e903
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:11:49 2014 -0400
refactored cgroup param parsing to util func
commit e3738b0168a075bd92ec828879b0e46bdbbe3845
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:57:19 2014 -0400
dat error checking
commit 57872bcc59403ecd308cfe97c78f73d6ca58d165
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:43:25 2014 -0400
proper use of fmt.Errorf
commit 43dad6acc0cb21aac2b04ce074699879898ee820
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:36:45 2014 -0400
proper placement of defer
commit b7f20b934b2bc92cd39397dbc608b77bff28493c
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:34:39 2014 -0400
defers, error checking, panic avoidance
commit 7a9a6ff267f8806dfe6676486f73fe89b72968fb
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:22:00 2014 -0400
data param to use container info instead of host
commit 0e0cf7309be1644687160d6519db792b23cd26e9
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:11:29 2014 -0400
added stats for cpuacct, memory, and blkio
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 86e34ce59fb7f6e6e284a33f2538bafdc9114c89
Component: engine
2014-04-20 11:34:28 -07:00
Lance Chen and Lance Chen
4690619ea9
Add missing blank lines in between list items
...
Lists with paragraphs as items need blank lines in between
items to generate correct layout.
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
Upstream-commit: b87cb76976da57a6765acd9a85494c68a4e6b948
Component: engine
2014-04-21 01:32:00 +08:00
Sven Dowideit
e783599ff4
on a fresh OSX, /usr/local/bin doesn't exist
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b26821e5c01bc0176357c41cdb7ff9a7cf3fb9df
Component: engine
2014-04-20 22:56:22 +10:00
Jack Danger Canty
66881af057
typo fix: 'methid' -> 'method'
...
Upstream-commit: 611a1d711bc382fb0dafafbdea5a5091383de972
Component: engine
2014-04-19 23:25:48 -07:00
Tianon Gravi
8d460ab22d
Merge pull request #5213 from tianon/missing-ps-requirement
...
Add missing "ps" requirement to PACKAGERS.md
Upstream-commit: 231f53fd9b52229ba3aa1d27bdebf775ab7397b5
Component: engine
2014-04-19 21:24:30 -06:00
Tianon Gravi
ffd34e18cf
Merge pull request #5313 from Lance0312/arch-fd-link
...
Fix borken /dev/fd in mkimage-arch.sh
Upstream-commit: cb2ce9089c571eb11c5c460e27e82ba32b1be9ef
Component: engine
2014-04-19 21:23:18 -06:00
Sven Dowideit
e5c2e2ce0f
Merge pull request #5312 from ostezer/docs-illusion-confusion
...
Urgent fix for crazy docs error on volumes.
Upstream-commit: f10bb364bedab7060657f313996fd7fecf50c67d
Component: engine
2014-04-20 12:02:47 +10:00
Tianon Gravi
5253167dce
Merge pull request #5249 from tianon/make-validate
...
Add "validate" Makefile target
Upstream-commit: f2f33d709633a66a5487a946d157e82d117d188b
Component: engine
2014-04-19 11:35:14 -06:00
O.S.Tezer
c61da19ea2
Urgent fix for crazy docs error on volumes.
...
Elaborate on the volumes example to prevent confusion.
Update: Amend the example so it is executable by the reader.
This includes fixing the erring "/var/logs" statement with "/var/log".
Update: Fix sentence structuring to better suit the 80chrs. limit.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 97daf9864d835ae0883b3c03382ac5dca11b4cc9
Component: engine
2014-04-19 19:35:00 +03:00
Sven Dowideit
04eca0093d
Merge pull request #5309 from ostezer/docs-fix-apostrophe
...
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
Upstream-commit: 1c7560289047fc3c374793b11a0fba07bf22939b
Component: engine
2014-04-19 20:39:27 +10:00
Sven Dowideit
0f92a67693
Merge pull request #5311 from ostezer/docs-fix-footer-links
...
Fix footer links. They are pointing to the wrong direzione.
Upstream-commit: c7f5799120859c39716267fca322b82d75ea2a03
Component: engine
2014-04-19 20:38:44 +10:00
Lance Chen
4dd6b5c6c0
Fix broken /dev/fd in mkimage-arch.sh
...
Exactly the same problem as dotcloud/docker#2356
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
Upstream-commit: e6b794e5424dd108003063f70e2fb2973dba643e
Component: engine
2014-04-19 16:04:35 +08:00
Michael Crosby
112b738831
Add remove method to subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7fdeda87173ee6722ef1cbe7b21a13ac8b173365
Component: engine
2014-04-18 22:17:31 -07:00
Michael Crosby
39b03cf53c
Break down groups into subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e92f2fd3950644a6e5eb38259cee9036648090cb
Component: engine
2014-04-18 22:10:30 -07:00
Michael Crosby
fec63c3950
Move raw cgroups into fs package (filesystem)
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 06db0604e5e5438dc14e13a069ebddcab7bb4bc6
Component: engine
2014-04-18 21:34:26 -07:00
Michael Crosby
91235494a6
Move systemd code into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ec43ec50b44cff3f043c78cad97466c68e2ba8cd
Component: engine
2014-04-18 21:30:08 -07:00
Michael Crosby
0b62a2c5be
Refactor cgroups file locations
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 42fb2973c690fe4e4f65da235ce4dfa4c388e8a3
Component: engine
2014-04-18 21:14:58 -07:00
O.S.Tezer
1e6c7a9fbb
Fix footer links. They are pointing to the wrong direzione.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: a96106b5f159791768174a6d74a1344b203de685
Component: engine
2014-04-19 04:13:52 +03:00
Solomon Hykes
cc849c45fa
Merge pull request #4166 from shykes/engine-logging
...
Engine: optional Logging field to disable custom logging in engine.
Upstream-commit: 4c720d4de73e53fa189083903e7ff825d0889021
Component: engine
2014-04-18 18:05:00 -07:00
O.S.Tezer
e0138ab848
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 2d6324e06a1e2ea8bb2236472a99c3dc4b5f66d1
Component: engine
2014-04-19 03:35:45 +03:00
Sven Dowideit
6132c88c2f
Merge pull request #5307 from ostezer/docs-amend-notes-warnings
...
Mark notes and warnings, fix broken link renderings within.
Upstream-commit: 87014c0328a95b9eade3a207cef77b71d8700565
Component: engine
2014-04-19 08:48:55 +10:00
O.S.Tezer
c565574306
Mark notes and warnings, fix broken link renderings within.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 7935850005b775e0cd1a99f9bab1b8cd53784c3a
Component: engine
2014-04-18 23:31:38 +03:00
Victor Vieux
08dcc28715
Merge pull request #5264 from unclejack/change_inode_map
...
change inode map to struct from bool
Upstream-commit: 5b6b91aa2c1354e484a64479418e92031765d41e
Component: engine
2014-04-18 11:48:23 -07:00
unclejack
5ba9282149
Merge pull request #5304 from vieux/convert_rm_tests
...
convert so rm tests to integration-cli
Upstream-commit: 2931979a5d6abb544fbbfdc359c5f6c131a58c41
Component: engine
2014-04-18 21:11:18 +03:00
unclejack
bd8b23c03f
Merge pull request #5296 from crosbymichael/move-integration-tests
...
Move integration tests
Upstream-commit: c25704e31bc68afaa22b886333d20c3bacbac2ec
Component: engine
2014-04-18 21:01:33 +03:00
Victor Vieux
86a52f5d6b
convert so rm tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: fcbc717f9aa11dae75d7418482f51cb61c0bf001
Component: engine
2014-04-18 17:40:12 +00:00
unclejack
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
shin-
ee1f88fe1b
Added support for multiple endpoints in X-Docker-Endpoints header
...
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com > (github: shin-)
Upstream-commit: 720f3447046355329b5ba5d850caca84328182d5
Component: engine
2014-04-18 17:42:54 +02:00
O.S. Tezer
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
Sven Dowideit
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
Michael Crosby
4078a75e3a
Remove worthless iptables test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 58e011595e4c518a38ec27716585177faa969f72
Component: engine
2014-04-18 03:22:53 +00:00
Michael Crosby
42d84ccd4c
Port privileged tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 296fcf331f2886d2aba3cfb929887dfbb603643d
Component: engine
2014-04-18 03:20:17 +00:00
Michael Crosby
a871063b21
Port networking tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: caad45d0edd9c1e48eac6e0ae0889039ca6844fc
Component: engine
2014-04-18 03:12:27 +00:00
Michael Crosby
1437557de2
Port environment test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 47510bd6eb83c43450ba53cb3db13aa340e8226c
Component: engine
2014-04-18 02:53:08 +00:00
Michael Crosby
e3eecbd979
Port user tests and concurrent tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e2ed4b9077a46adbe3e4388166bb41969f7fb425
Component: engine
2014-04-18 02:47:39 +00:00
James Turnbull
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
Sven Dowideit
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
Sven Dowideit
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
James Turnbull
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
Michael Crosby
a4830050bf
Port volumes and exit code tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 03993eb5340f1d520e23eac3dfe01d604fe7297f
Component: engine
2014-04-18 02:34:10 +00:00
Michael Crosby
94560a8cac
Update commit test in cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6beb858fb0290137c787c9728d84436461c352a0
Component: engine
2014-04-18 02:24:19 +00:00
Michael Crosby
77c1ab46b6
Port multiple attach test to cli tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 72f49e554f4d4345238b983d0c820e1e3320f9e5
Component: engine
2014-04-18 02:14:00 +00:00
Michael Crosby
fa56c6f0d6
Add test verify container ID
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 76a19bb3a95ef788cd889b36b0af3b79327ff431
Component: engine
2014-04-18 01:58:20 +00:00
Sven Dowideit
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
O.S.Tezer
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
Michael Crosby
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
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
James Turnbull
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