Lei Jitang
ce5bbed858
Docs: remove networkdriver from README.md in daemon
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-22 10:09:07 +08:00
Brian Goff
5929502b4e
Merge pull request #15412 from vdemeester/dont-sleep-too-much
...
time.Sleep in integration tests — comment and waitRun/waitInspect
2015-08-21 20:43:55 -04:00
Jessie Frazelle
90801ab939
Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
...
Windows: Graphdriver should reject create of layer w/o parent
2015-08-21 16:34:03 -07:00
Jessie Frazelle
fefc9a3a6a
Merge pull request #15750 from mountkin/fix-exec-panic
...
fix a panic when the exec fails to start
2015-08-21 15:54:58 -07:00
Tianon Gravi
b8bed8832b
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>
2015-08-21 15:47:50 -07:00
Jessie Frazelle
c5733e6a20
Merge pull request #15366 from rvesse/sysvinit-redhat-silent-fail
...
Fix silent failure in RedHat sysvinit script
2015-08-21 14:54:25 -07:00
Jessie Frazelle
e5e6eaacee
Merge pull request #15492 from vbatts/update-tar-split
...
vendor: update tar-split to v0.9.6
2015-08-21 14:45:19 -07:00
Sebastiaan van Stijn
9415db7e95
Merge pull request #15742 from Microsoft/addazure
...
Add Microsoft Azure
2015-08-21 23:41:36 +02:00
Jessie Frazelle
9bd8a9b66b
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
2015-08-21 14:34:27 -07:00
Jessie Frazelle
ecff4badcd
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
2015-08-21 14:27:59 -07:00
Jessie Frazelle
008a8ffdd2
Merge pull request #15218 from calavera/gender_unbiased_names
...
Add more amazing women to the names generator.
2015-08-21 14:24:49 -07:00
Jessie Frazelle
19f7bfcda9
Merge pull request #15507 from clintonskitson/patch_issue_15467
...
added check for bind on create to determine local volume driver
2015-08-21 14:23:44 -07:00
Jessie Frazelle
9b8cfb6c79
Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRestarting
...
daemon/state: separate part of SetRestarting to setRestarting
2015-08-21 14:21:10 -07:00
Jessie Frazelle
9d22c7a2d5
Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun
...
docker 1.8+ no longer needs dind
2015-08-21 13:51:41 -07:00
Jessie Frazelle
616950b030
Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config
...
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
2015-08-21 13:48:28 -07:00
Stefan J. Wernli
a456f20b44
Windows: Graphdriver should reject create of layer w/o parent
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-08-21 13:23:04 -07:00
Jessie Frazelle
e6be51a0f9
Merge pull request #15758 from jfrazelle/EOL-fedora-20
...
fedora 20 is EOL remove from rpm builder
2015-08-21 13:15:58 -07:00
moxiegirl
1425b185db
Merge pull request #15746 from Microsoft/libcontainer-spec-location
...
Updated spec location for libcontainer
2015-08-21 11:15:28 -07:00
Jessica Frazelle
c48ac77840
update hack/dind for 1.8 mounting of cgroups
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-21 11:13:33 -07:00
Jessica Frazelle
ee1304a35e
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-21 11:01:18 -07:00
Tonis Tiigi
0c08913d52
Remove nil contexts
...
Causes daemon panic because loggers can’t be found.
Fixes #15724
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-21 10:31:27 -07:00
Shijiang Wei
fcf9daad91
fix a panic when the exec fails to start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-08-22 00:01:44 +08:00
Brian Goff
eb7b2ed6bb
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
2015-08-21 11:07:02 -04:00
Brian Goff
85bef48bf5
Merge pull request #15754 from mountkin/fix-return
...
modify a return value in graph/tags.go to increase readability
2015-08-21 10:55:50 -04:00
Brian Goff
10c97a310a
Merge pull request #15751 from nf/bcw
...
Use a slice instead of a map of io.WriteClosers in broadcastwriter
2015-08-21 10:51:07 -04:00
Shijiang Wei
f11b7acc73
modify a return value in graph/tags.go to increase readability
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-08-21 21:36:30 +08:00
Andrew Gerrand
31cbf76d0c
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>
2015-08-21 14:08:04 +01:00
Sebastiaan van Stijn
5ceff3f191
Merge pull request #15718 from ZJU-SEL/rm-volume-action
...
specify `docker run --rm` action when it comes to volume
2015-08-21 08:50:18 +02:00
Tonis Tiigi
2d1158790d
Make graph.Register take in io.Reader
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-20 20:37:11 -07:00
Lei Jitang
c8a46cb0b2
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
2015-08-21 11:29:53 +08:00
John Howard
011b4ca256
Updated spec location for libcontainer
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-08-20 20:04:04 -07:00
John Howard
faf9e34067
Update readme
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-08-20 19:55:32 -07:00
John Howard
98f60aef13
Add Microsoft Azure
...
Signed-off-by: John Howard <john.howard@microsoft.com>
2015-08-20 18:35:21 -07:00
He Simei
76a559ccb2
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-08-21 08:52:06 +08:00
David Calavera
d760947b2e
Merge pull request #15716 from calavera/release_checklist_docs
...
Corrections in the release checklist.
2015-08-20 22:29:42 +01:00
Sebastiaan van Stijn
9ed5cf08a3
Merge pull request #15732 from moxiegirl/15731-fixes
...
Examples index has broken links
2015-08-20 22:56:45 +02:00
Mary Anthony
15c24db9a5
Examples index has broken links
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-20 13:40:03 -07:00
Sebastiaan van Stijn
ec43113662
Merge pull request #15697 from sallyom/man-commit-fix
...
fix format man-commit
2015-08-20 21:33:46 +02:00
Sebastiaan van Stijn
ba9496ae48
Merge pull request #15688 from Evalle/15564-fix-windows-doc
...
Fix a windows doc issue
2015-08-20 20:39:16 +02:00
evalle
3c61ede074
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-08-20 14:14:48 +02:00
Sven Dowideit
272a3eef94
Merge pull request #15696 from sallyom/man-history-fixup
...
add -H to SYNOPSIS man-history
2015-08-20 22:11:50 +10:00
Brian Goff
44465098cb
Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio
...
Fix docker stats show blkio when there are multiple block device
2015-08-20 07:53:38 -04:00
David Calavera
1d0ee18d6b
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>
2015-08-20 11:52:56 +01:00
David Calavera
d959739125
Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
...
Fix Compose 1.2 changelog link
2015-08-20 11:42:14 +01:00
Doug Davis
90ebc3b455
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
2015-08-20 03:25:00 -07:00
Aanand Prasad
23d3e4bb03
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>
2015-08-20 11:09:10 +01:00
Clinton Kitson
6b8129d1fe
added check for bind on create to determine local volume driver
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
2015-08-20 01:40:04 -07:00
Lei Jitang
211449a1ca
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com>
2015-08-20 11:46:21 +08:00
Ma Shimiao
a6ed990593
daemon/state: separate part of SetRestarting to setRestarting
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-08-20 11:14:28 +08:00
Brian Goff
8acd006fd9
Merge pull request #15707 from icaroseara/fix_typo
...
Fix typo, "fil" -> "fill"
2015-08-19 21:25:43 -04:00