David Calavera
72c425785c
Merge pull request #19534 from hqhq/hq_fix_update_swap
...
Fix comment about swap limit of docker update
2016-01-21 08:12:00 -08:00
Tonis Tiigi
98d0997894
Revert "Copy aufs hardlinks to top layer"
...
This reverts commit ef05b83417 .
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-01-21 07:52:50 -08:00
Aanand Prasad
642e71b4c7
Stop and remove containers in parallel when scaling down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-01-21 15:28:40 +00:00
Aanand Prasad
755c49b500
Fix scale when containers exit immediately
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-01-21 15:19:55 +00:00
Aanand Prasad
ee63075a34
Support links in v2 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-01-21 14:34:26 +00:00
Tibor Vass
757d686700
Merge pull request #19500 from cpuguy83/fix_loading_with_containerized_plugins
...
Fix loading with containerized plugins
2016-01-21 08:57:01 -05:00
Vincent Demeester
476edba011
Merge pull request #19483 from coolljt0725/fix_19477
...
Fix #19477 , clean up the ports when release network
2016-01-21 14:29:29 +01:00
Harald Albers
ab01b6f385
Refactor handling of key specific subcompletions
...
The currently used idiom for handling key specific subcompletions
did not work here: behind `docker event -f type=network `, the completion
of networks triggered. The expected behaviour is not to complete
anything here.
In order to limit the scope of the corresponding PR, the new idiom is
currently only used in `docker events --filter`.
Signed-off-by: Harald Albers <github@albersweb.de >
2016-01-21 14:24:31 +01:00
Harald Albers
fcc035848f
Support new events in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-01-21 13:57:35 +01:00
Azat Khuyiyakhmetov
935849f17a
Fixed typo in "/etc/subUid"
...
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru >
2016-01-21 12:46:29 +01:00
Aanand Prasad
5a249bd9f5
Fix Windows build failures when installing dependencies from git
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2016-01-21 11:39:08 +00:00
Antonio Murdaca
db25ba1486
Merge pull request #19536 from wenchma/fix_typo
...
Fixes the typo of docker_cli_network_unix_test.go
2016-01-21 09:42:36 +01:00
Wen Cheng Ma
2e6b1eb309
Fixes the typo of docker_cli_network_unix_test.go
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-01-21 16:37:17 +08:00
Jess Frazelle
5537a92e45
Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
...
Cleanup build rpm deb
2016-01-20 23:58:33 -08:00
David Gageot
6ed2ab0e79
Always wait for the host-only adapter to appear
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-21 07:55:28 +01:00
Qiang Huang
603bc69b2c
Fix comment about swap limit of docker update
...
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2016-01-21 13:48:53 +08:00
Sebastiaan van Stijn
7db58948bf
Merge pull request #19434 from HackToday/fixmntvolume
...
Refine the volume mount example
2016-01-20 20:42:24 -08:00
Sebastiaan van Stijn
13dbf52611
Merge pull request #19530 from HackToday/fixtiny
...
Fix the typo in ps
2016-01-20 20:41:35 -08:00
Kai Qiang Wu(Kennan)
c2b59b03df
Fix the typo in ps
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-01-21 04:26:49 +00:00
Alexander Morozov
781a33b6e7
Reuse subsystems mountpoints between checks
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-01-20 19:20:59 -08:00
Dong Chen
14bfc52d36
Enforce minimum backoff to avoid simultaneous validation on one engine.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-01-20 17:49:40 -08:00
moxiegirl
20a71f706c
Merge pull request #1299 from carolfh/jira1753config
...
performed the following: closed jira 1753, updated graphics, removed …
2016-01-20 17:30:07 -08:00
Brian Goff
7bf776f1c3
Merge pull request #19482 from LK4D4/up_osx_sdk
...
Move long compilations before Go install in Dockerfile
2016-01-20 20:11:32 -05:00
Lei Jitang
6025517b68
Fix #19477 , clean up the ports when release network
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-01-20 20:09:11 -05:00
Alexander Morozov
22ebeede30
Reuse *sysinfo.SysInfo instance in verification
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2016-01-20 17:08:10 -08:00
Lei Jitang
bb8d8a645a
Merge pull request #19430 from keloyang/StatsNoStreamGetCpu
...
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
2016-01-21 09:07:00 +08:00
Riyaz Faizullabhoy
25a1e9aed7
change to ListRoles, and GetAllLoadedRoles
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-01-20 15:58:55 -08:00
Nathan LeClaire
474363d27a
Merge pull request #2821 from hypriot/check-grand-parent-for-windows-shell
...
Detect shell from grand parent process name if not directly called from a windows shell
2016-01-20 15:55:23 -08:00
Nathan LeClaire
1449d69cde
Merge pull request #2885 from exoscale/fix/doc-exoscale
...
docs: fix --exoscale-image description in documentation
2016-01-20 15:53:55 -08:00
Aaron Lehmann
a160dd4987
Vendor updated distribution
...
The only changes are https://github.com/docker/distribution/pull/1379
and https://github.com/docker/distribution/pull/1380 .
Fixes #19476
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-20 15:46:11 -08:00
Stephen Day
08650825fe
Merge pull request #1380 from aaronlehmann/avoid-empty-accept-header
...
Avoid empty Accept headers in client requests
2016-01-20 15:38:07 -08:00
Carol Fager-Higgins
6e3d9bc4f2
performed the following: closed jira 1753, updated graphics, removed incorrect text
...
fixed misdirected link for admin.md
restarting tests
added Don's comments to config file
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
2016-01-20 15:25:39 -08:00
Aaron Lehmann
acf02bead3
Avoid empty Accept headers in client requests
...
One of the keys in the manifest media type map is an empty string. This
should not be sent as an Accept header.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-20 15:22:38 -08:00
David Calavera
ee001d87a9
Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name
...
Don't error out when link name in use.
2016-01-20 15:21:58 -08:00
Stephen Day
182bddcf11
Merge pull request #1379 from aaronlehmann/token-error
...
Handle nonstandard token endpoint errors
2016-01-20 15:07:47 -08:00
Alexander Morozov
4a9523adc9
Merge pull request #19513 from crosbymichael/tty-restore
...
Move tty set and restore to caller
2016-01-20 15:05:14 -08:00
Sebastiaan van Stijn
ad87333f79
Merge pull request #19452 from mortonfox/patch-1
...
cgroups documentation moved
2016-01-20 14:54:24 -08:00
David Calavera
7915077a38
Merge pull request #19485 from HackToday/fixlink
...
Fix the ulimit link
2016-01-20 14:53:38 -08:00
Sebastiaan van Stijn
048234fcdb
Merge pull request #19487 from HackToday/fixcommitcli
...
Fix commit wrong repository example
2016-01-20 14:45:59 -08:00
Aaron Lehmann
ec636bbfd2
Handle nonstandard token endpoint errors
...
https://github.com/docker/distribution/pull/1249 changed token fetching
to parse HTTP error response bodies as serialized errcodes. However,
Docker Hub's authentication endpoint does not return error bodies in
this format. To work around this, convert its format into
ErrCodeUnauthorized or ErrCodeUnknown.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-01-20 14:45:08 -08:00
Ying Li
803205d8bf
Update and add tests for what happens if the remote repo 404's or 500's on root.json.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-01-20 14:41:54 -08:00
Derek McGowan
e9d5292b0c
Unwrap URL errors on retry
...
When authorization errors are returned by the token process the error will be wrapped in url.Error.
In order to check the underlying error for retry this error message should be unwrapped.
Unwrapping this error allows failure to push due to an unauthorized response to keep from retrying, possibly resulting in later 429 responses.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-01-20 14:29:38 -08:00
Sebastiaan van Stijn
c21eb2a420
Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles
...
Remove validate-vendor from default bundles
2016-01-20 14:29:07 -08:00
Alexandre Vázquez
24330408e9
Introduce a delay and a two-step close windows procedure to allow to receive and execute the order to close the machine when Kitematic closes on Windows.
2016-01-20 23:01:03 +01:00
Christopher Jones
3aa778d6a0
Update registry in Dockerfile.ppc64le
...
This updates the Dockerfile registry version on ppc64le to be
consistent with 6309947718
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2016-01-20 16:57:18 -05:00
Brian Goff
332d95fd0d
Don't error out when link name in use.
...
This preserves old behavior from sqlite links/names.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-01-20 16:40:56 -05:00
Michael Crosby
a1eb6029cc
Move tty set and restore to caller
...
Fixes #19506
This fixes the issue of errors on create and the tty not being able to
be restored to its previous state because of a race where it was
in the hijack goroutine.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2016-01-20 13:32:19 -08:00
Richard Scothern
dd0d5a31f5
Merge pull request #1378 from stevvooe/update-specification-changelog
...
spec/api: add missing entries to changelog
2016-01-20 13:09:44 -08:00
Alexander Morozov
7bddbdf360
Merge pull request #19503 from jfrazelle/update-logrus
...
bump logrus
2016-01-20 12:54:49 -08:00
Brian Bland
06e9a056ca
Fixes layer MediaTypes in manifests created from a cross-repository push
...
Signed-off-by: Brian Bland <brian.bland@docker.com >
2016-01-20 12:23:16 -08:00