bfcda62bd6
Add some missing cgroup test require and refactor the require check.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c340ca4f5db9ab526532f26718a140654ff45458
Component: engine
2015-08-24 11:37:11 +08:00
a4109bfd5c
Merge pull request #15774 from charleswhchan/patch-4
...
Revise Mac Docker instructions
Upstream-commit: 7ead74d903de625eef9dc0ec83ba5bcedd0bc0dc
Component: engine
2015-08-23 10:26:58 +02:00
7652408d2c
Merge pull request #15769 from charleswhchan/patch-1
...
Revise Windows Docker instructions
Upstream-commit: 819166c16cfa5911751501e2e0c99cf7b8e6e732
Component: engine
2015-08-23 12:11:37 +10:00
39b3c96373
Revise Mac Docker instructions
...
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 9572edc34a65736415050f02df3822edeaa55dbc
Component: engine
2015-08-22 08:00:48 -07:00
7f28a26384
Revise Windows Docker instructions
...
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 3faba5fbe264425ac6d15bdfdf3c5a72e25643cb
Component: engine
2015-08-22 07:26:26 -07:00
661743fa45
Merge pull request #15764 from coolljt0725/docs_update_readme_in_daemon
...
Docs: remove networkdriver from README.md in daemon
Upstream-commit: efabc8ee1a691ec9ed643236ef664c9965be80de
Component: engine
2015-08-22 13:36:38 +02:00
c6342a854c
Merge pull request #15763 from tianon/dind-tmp
...
Update dind "/tmp" mounting to be optional
Upstream-commit: 5fd15da7daad56c07842ecda082e9c5d0e6ff620
Component: engine
2015-08-21 21:14:35 -07:00
5221811ef0
Docs: remove networkdriver from README.md in daemon
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: ce5bbed8582227482f7afa1c647d52eab9fb2de3
Component: engine
2015-08-22 10:09:07 +08:00
e2e0f70ccb
Merge pull request #15412 from vdemeester/dont-sleep-too-much
...
time.Sleep in integration tests — comment and waitRun/waitInspect
Upstream-commit: 5929502b4e05ed82e78347169f3ba705cac8ad35
Component: engine
2015-08-21 20:43:55 -04:00
427f147704
Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
...
Windows: Graphdriver should reject create of layer w/o parent
Upstream-commit: 90801ab9398d80576003d31255dd08613393b741
Component: engine
2015-08-21 16:34:03 -07:00
a372501fd6
Merge pull request #15750 from mountkin/fix-exec-panic
...
fix a panic when the exec fails to start
Upstream-commit: fefc9a3a6ae9ccb738a4e984ff90db70bb053484
Component: engine
2015-08-21 15:54:58 -07:00
590a40fb3c
Update dind "/tmp" mounting to be optional
...
This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b8bed8832b77a478360ae946a69dab5e922b194e
Component: engine
2015-08-21 15:47:50 -07:00
fbe61adda8
Merge pull request #15366 from rvesse/sysvinit-redhat-silent-fail
...
Fix silent failure in RedHat sysvinit script
Upstream-commit: c5733e6a20a7a8e3a777defb1b1cd5c4e9b52d9c
Component: engine
2015-08-21 14:54:25 -07:00
ec7a94a85c
Merge pull request #15492 from vbatts/update-tar-split
...
vendor: update tar-split to v0.9.6
Upstream-commit: e5e6eaacee75933c074e02aa2663c69a30e51027
Component: engine
2015-08-21 14:45:19 -07:00
4416c4b68a
Merge pull request #15742 from Microsoft/addazure
...
Add Microsoft Azure
Upstream-commit: 9415db7e95858683ec94265c4a8108ad399867dd
Component: engine
2015-08-21 23:41:36 +02:00
26bf545a48
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
2015-08-21 14:34:27 -07:00
ad05d1ea8d
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
Upstream-commit: ecff4badcd98f749e5bd8511fbf4ca2c605db96c
Component: engine
2015-08-21 14:27:59 -07:00
2ec9a2ac53
Merge pull request #15218 from calavera/gender_unbiased_names
...
Add more amazing women to the names generator.
Upstream-commit: 008a8ffdd20f710bb177c299d4f3f5a2024894c4
Component: engine
2015-08-21 14:24:49 -07:00
20b08ad6cb
Merge pull request #15507 from clintonskitson/patch_issue_15467
...
added check for bind on create to determine local volume driver
Upstream-commit: 19f7bfcda9ea11806a39a6508d3961649ba8ba5d
Component: engine
2015-08-21 14:23:44 -07:00
48cf51659b
Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRestarting
...
daemon/state: separate part of SetRestarting to setRestarting
Upstream-commit: 9b8cfb6c79904bf74edae7c3fcc317e525f82fc7
Component: engine
2015-08-21 14:21:10 -07:00
7ec0d0652b
Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun
...
docker 1.8+ no longer needs dind
Upstream-commit: 9d22c7a2d561e2b8379b8cf890d5873d529cd122
Component: engine
2015-08-21 13:51:41 -07:00
ce4b3c1927
Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config
...
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
Upstream-commit: 616950b0307cfb76fc3f68649993d39bd2de87ae
Component: engine
2015-08-21 13:48:28 -07:00
0e5e69219f
Windows: Graphdriver should reject create of layer w/o parent
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: a456f20b44637b861740a7dd0102073f6390c452
Component: engine
2015-08-21 13:23:04 -07:00
7b13843714
Merge pull request #15758 from jfrazelle/EOL-fedora-20
...
fedora 20 is EOL remove from rpm builder
Upstream-commit: e6be51a0f93ce5e5213aef2c0f6329b9b3762a4a
Component: engine
2015-08-21 13:15:58 -07:00
43529eceba
Merge pull request #15746 from Microsoft/libcontainer-spec-location
...
Updated spec location for libcontainer
Upstream-commit: 1425b185dbf18ff9061a53f381ef8166aacbc8aa
Component: engine
2015-08-21 11:15:28 -07:00
74f373df66
update hack/dind for 1.8 mounting of cgroups
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c48ac77840f1aa22a76428e2451ca1ae9cf85a48
Component: engine
2015-08-21 11:13:33 -07:00
24242b6544
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ee1304a35e73049221f8f2c485b5aa2684c1725f
Component: engine
2015-08-21 11:01:18 -07:00
589fca3f48
fix a panic when the exec fails to start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: fcf9daad91d9be24ceddbc4add4d3a8179c9b32c
Component: engine
2015-08-22 00:01:44 +08:00
340de9e282
Merge pull request #15748 from coolljt0725/fix_daemon_start_with_old_running_container
...
Fix docker daemon start with old running container which use thirdparty volume plugin
Upstream-commit: eb7b2ed6bbe3fbef588116d362ce595d6e35fc43
Component: engine
2015-08-21 11:07:02 -04:00
aa86f75147
Merge pull request #15754 from mountkin/fix-return
...
modify a return value in graph/tags.go to increase readability
Upstream-commit: 85bef48bf5a0c781cfa6418fa63318a94032efc7
Component: engine
2015-08-21 10:55:50 -04:00
b083881f37
Merge pull request #15751 from nf/bcw
...
Use a slice instead of a map of io.WriteClosers in broadcastwriter
Upstream-commit: 10c97a310a0ebd74c1b6b94b75391988dc6d8def
Component: engine
2015-08-21 10:51:07 -04:00
226177670d
modify a return value in graph/tags.go to increase readability
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: f11b7acc73b333eb480d2520f703f0a9c50d0a0e
Component: engine
2015-08-21 21:36:30 +08:00
b923556f4c
Use a slice instead of a map of io.WriteClosers in broadcastwriter
...
Maps rely on the keys being comparable.
Using an interface type as the map key is dangerous,
because some interface types are not comparable.
I talked about this in my "Stupid Gopher Tricks" talk:
https://talks.golang.org/2015/tricks.slide
In this case, if the user-provided writer is backed by a slice
(such as io.MultiWriter) then the code will panic at run time.
Signed-off-by: Andrew Gerrand <adg@golang.org >
Upstream-commit: 31cbf76d0c287d451182499d4fa0c4fda67e0716
Component: engine
2015-08-21 14:08:04 +01:00
6072363c3c
Merge pull request #15718 from ZJU-SEL/rm-volume-action
...
specify `docker run --rm` action when it comes to volume
Upstream-commit: 5ceff3f191ec7678362d2538aab7ed54ce17b859
Component: engine
2015-08-21 08:50:18 +02:00
0313208649
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
Upstream-commit: c8a46cb0b2793bb7d742a3d221ec733d1bbaae2c
Component: engine
2015-08-21 11:29:53 +08:00
363404a258
Updated spec location for libcontainer
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 011b4ca25607d6085dee5c247b270f48e324eb3f
Component: engine
2015-08-20 20:04:04 -07:00
1eb281c51b
Add Microsoft Azure
...
Signed-off-by: John Howard <john.howard@microsoft.com >
Upstream-commit: 98f60aef130a40be260c490273d10504a7d2623c
Component: engine
2015-08-20 18:35:21 -07:00
042270cda3
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 76a559ccb288632ca650abe704a48581365f1ab4
Component: engine
2015-08-21 08:52:06 +08:00
781da712cd
Merge pull request #15716 from calavera/release_checklist_docs
...
Corrections in the release checklist.
Upstream-commit: d760947b2e6aff391bf93047ce6bdf96dc1d2769
Component: engine
2015-08-20 22:29:42 +01:00
ff9598bfc6
Merge pull request #15732 from moxiegirl/15731-fixes
...
Examples index has broken links
Upstream-commit: 9ed5cf08a3fc04894b141d35e96aecbed75e0cb4
Component: engine
2015-08-20 22:56:45 +02:00
cd8e412feb
Examples index has broken links
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 15c24db9a59bf2c3eb02f7a18ffd501284893ed3
Component: engine
2015-08-20 13:40:03 -07:00
c83772f751
Merge pull request #15697 from sallyom/man-commit-fix
...
fix format man-commit
Upstream-commit: ec43113662ad793d28cf4657deba6b44de61d3b9
Component: engine
2015-08-20 21:33:46 +02:00
3c892cd13a
Merge pull request #15688 from Evalle/15564-fix-windows-doc
...
Fix a windows doc issue
Upstream-commit: ba9496ae48f90ae6741c646a6a0bbd0ee9421aa9
Component: engine
2015-08-20 20:39:16 +02:00
1d21d4d6c1
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 3c61ede074000933f2290f8765bc4cface18c0ea
Component: engine
2015-08-20 14:14:48 +02:00
9edc367ed4
Merge pull request #15696 from sallyom/man-history-fixup
...
add -H to SYNOPSIS man-history
Upstream-commit: 272a3eef9454236328b728ac43b0382142f00ecb
Component: engine
2015-08-20 22:11:50 +10:00
5057f24db0
Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio
...
Fix docker stats show blkio when there are multiple block device
Upstream-commit: 44465098cb84a982547f4f7347918fce6e6bb883
Component: engine
2015-08-20 07:53:38 -04:00
7e1b5e9f5e
Corrections in the release checklist.
...
- Add a note about creating the release in GitHub.
- Fix docs release process.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1d0ee18d6be00acc5b24f54f7e3529a02f1d1222
Component: engine
2015-08-20 11:52:56 +01:00
4cc1c4efc3
Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
...
Fix Compose 1.2 changelog link
Upstream-commit: d959739125fce0da8e5ee9f121cfed08106da56b
Component: engine
2015-08-20 11:42:14 +01:00
3b6efefc4b
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
Upstream-commit: 90ebc3b455c93490c3886aaa491c7e67b7b1ec48
Component: engine
2015-08-20 03:25:00 -07:00
8569d41383
Fix Compose 1.2 changelog link
...
Hardcode the release tag, so that:
- it goes straight to the changes for 1.2, not whatever the current
version is
- it still works now that we've renamed CHANGES.md to CHANGELOG.md
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: 23d3e4bb0318b42d9a160e7f44b87382ce40840f
Component: engine
2015-08-20 11:09:10 +01:00
