0e42edc6fd
Merge pull request #27630 from runcom/fix-info-route
...
api/server/router/system: fix info versioning
Upstream-commit: b54a1d83fa9ea3c1d2903138b7f9cd04f8557c20
Component: engine
2016-10-21 18:58:10 -07:00
2a18c9fa95
Merge pull request #26973 from allencloud/change-code-in-container-restore
...
change code in container restore
Upstream-commit: a6688959b4d574994f29af43d263caa83ee89ed2
Component: engine
2016-10-21 18:53:37 -07:00
50cd7220fb
Merge pull request #27640 from thaJeztah/carry-26348-update-remote-api
...
[carry 26348] Update cURL connection example in remote API reference
Upstream-commit: 064eda192e945f70c405ce537ad9f8843fb9205b
Component: engine
2016-10-21 18:17:33 -07:00
36c938c12b
Merge pull request #27117 from dnephin/swagger-gen
...
Add swagger.yaml and generate a few types from the spec
Upstream-commit: 3c385b9f6b820ae3badfbdcca589377e9a75e7fb
Component: engine
2016-10-21 18:15:28 -07:00
accc5bf3d7
Merge pull request #27609 from tonistiigi/fix-chroot-shared-parent
...
chroot: remount everything as private in new mntns
Upstream-commit: 87ae571fed06193a319c6776bfd19cc64067e511
Component: engine
2016-10-21 14:40:40 -07:00
d87cb9a48f
Merge pull request #27522 from vieux/data_race_plugins
...
prevent data race in pkg/plugins
Upstream-commit: d0e6dae233e0f66aa969a2ac3d28685c365cdf6c
Component: engine
2016-10-21 14:19:48 -07:00
f449f9bc63
prevent data race in pkg/plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f7af80860cf99ce808834260ac190a2a88bc24e2
Component: engine
2016-10-21 13:28:13 -07:00
871253dbbe
Update cURL example for cURL 7.40 differences
...
cURL 7.50 changed the validation for URL's
when using socket connections. cURL 7.4x
did not expect a hostname, whereas cURL
7.5x and above _requires_ a hostname.
See https://github.com/curl/curl/issues/936
This updates the example to take both
versions into account, because cURL 7.4x
is still widely used by distros.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2e0d6e6be2294ef2561e8c3b5f750fd814536268
Component: engine
2016-10-21 11:40:58 -07:00
3b96eed08f
Update docker_remote_api.md
...
See https://github.com/docker/docker/issues/26099#issuecomment-245007539
Signed-off-by: Gerwim Feiken <g.feiken@tfe.nl >
Upstream-commit: 587b186f85383f98f5475b8c16b883553299b525
Component: engine
2016-10-21 11:34:08 -07:00
bf7ee5e9d0
Merge pull request #27575 from yuexiao-wang/fix-cli-link
...
Modify the links for docker container commands
Upstream-commit: 78dae2a037e87825381ec4efb9fb47491f41e7e4
Component: engine
2016-10-21 11:15:57 -07:00
c9e05dd482
Merge pull request #27579 from albers/completion-container
...
Add bash completion for new `docker container` subcommands
Upstream-commit: 95c36b301bdbb9fe5cad3b476a8c5fb29d0cd2e4
Component: engine
2016-10-21 09:47:55 -07:00
661452cc19
Merge pull request #27405 from tonistiigi/fix-fifo2
...
Fix issues with fifos blocking on open
Upstream-commit: 32b541e44385206772b30b2a6f241a7c809aa62f
Component: engine
2016-10-21 09:44:33 -07:00
06e29a1764
Merge pull request #27490 from caarlos0/editorconfig
...
added editorconfig
Upstream-commit: 0c767f0a6ceea7b858afc5fa97f77873849fce5b
Component: engine
2016-10-21 09:15:17 -07:00
b7ec1ec845
Merge pull request #27618 from allencloud/vendor-go-units
...
revendor go-units to update more accurate duration display
Upstream-commit: 29f676564ddbfaa2b21087a8887849655e355a4e
Component: engine
2016-10-21 17:14:20 +02:00
6c03315e4f
Move bash completion logic to new subcommand: wait
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 93ccf95db1719df8127be9942db296308c33daad
Component: engine
2016-10-21 12:39:32 +02:00
b5205feca1
Move bash completion logic to new subcommand: update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f9a24c72bac315a03c41ad48e8073c164721e58c
Component: engine
2016-10-21 12:39:32 +02:00
cc509b2720
Move bash completion logic to new subcommand: unpause
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6ac201721ff21425e6a6220fd166c68e34715f10
Component: engine
2016-10-21 12:39:32 +02:00
f55bd670a7
Move bash completion logic to new subcommand: top
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4bab104761c1af134e8f098d7f2d0072bb7c64c7
Component: engine
2016-10-21 12:39:32 +02:00
a016d56d65
Move bash completion logic to new subcommand: stop
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 150dcabc0f8b4c238b4e98c015fc7373b2d293b8
Component: engine
2016-10-21 12:39:32 +02:00
a0d87aba08
Move bash completion logic to new subcommand: stats
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 19f31f8e481e00fe2f19e5341696e7f810d2bbb2
Component: engine
2016-10-21 12:39:32 +02:00
0eda6f996b
Move bash completion logic to new subcommand: start
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2bbfd01e7a0e70fcbfdc756c393a8d8aef217d76
Component: engine
2016-10-21 12:39:32 +02:00
e43240c557
Move bash completion logic to new subcommand: run
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5200d18dbf8abf9171818db735a23f87978008bc
Component: engine
2016-10-21 12:39:32 +02:00
15649f5936
Move bash completion logic to new subcommand: rm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9fc4670b3b1f83adc04230619c9181b7d6b4ccce
Component: engine
2016-10-21 12:39:32 +02:00
fa16e189ad
Move bash completion logic to new subcommand: restart
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 58027826d4fb1b87a59b8f1a6e2b23780f389619
Component: engine
2016-10-21 12:39:32 +02:00
0629b87f8c
Move bash completion logic to new subcommand: port
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 96547d0e88250ac009d1c73cc9b61ae88452ae27
Component: engine
2016-10-21 12:39:32 +02:00
5b1ad7b5a9
Move bash completion logic to new subcommand: port
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 48e75d4bc2cbe2bf3414613262eab0b5dc585555
Component: engine
2016-10-21 12:39:32 +02:00
507fa2bf07
Move bash completion logic to new subcommand: pause
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 27abd030591d7b5e3b9718c967ab283def411d1e
Component: engine
2016-10-21 12:39:32 +02:00
35fce53c94
Move bash completion logic to new subcommand: ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a91fb558d2c7e7958baad19db0950fa6312ae47d
Component: engine
2016-10-21 12:39:32 +02:00
b52b64a1cb
Move bash completion logic to new subcommand: logs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4dedad31182bacde2074578e6e5520d8fb7619bb
Component: engine
2016-10-21 12:39:32 +02:00
75140aa68c
Move bash completion logic to new subcommand: kill
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f1e12a495148852da2cc1d96b750ee496d3a2d0b
Component: engine
2016-10-21 12:39:32 +02:00
98b9915bd0
Move bash completion logic to new subcommand: inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3cd9f226649c527fcc1a8bdffdeb7005b7084077
Component: engine
2016-10-21 12:39:32 +02:00
02c1a5c4e0
Move bash completion logic to new subcommand: diff
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3b6f6611b04eee06c77d578ba9d8ea6346eadb8c
Component: engine
2016-10-21 12:39:32 +02:00
afd1a1c262
Move bash completion logic to new subcommand: exec
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8fde0d7f2b6822e82220a37a055f3f772036bf8b
Component: engine
2016-10-21 12:39:32 +02:00
32b1cab2c4
api/server/router/system: fix info versioning
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 63b5a372037081175ab4ea8f3c7a7bef2195ec0b
Component: engine
2016-10-21 12:32:23 +02:00
f441b12ee3
Move bash completion logic to new subcommand: diff
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f15debe56c918f74a23c230e6346635fe90bd553
Component: engine
2016-10-21 12:32:08 +02:00
c47611895a
Move bash completion logic to new subcommand: create
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: cd4a490b3f7a53a89d538e1f0eb92eda75af0519
Component: engine
2016-10-21 12:32:08 +02:00
103a2934c7
Move bash completion logic to new subcommand: cp
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 939a97f7acc14b9104159d7d2e8489c517774fdb
Component: engine
2016-10-21 12:32:08 +02:00
abbc542480
Move bash completion logic to new subcommand: commit
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6a0dff0a9a17aeeabb84aedd2c37008ca93f4a82
Component: engine
2016-10-21 12:32:08 +02:00
da37072dda
Move bash completion logic to new subcommand: attach
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc5794b3060f51470998b11bb5b34d9efbe97dc3
Component: engine
2016-10-21 12:32:08 +02:00
91e3d19aab
Add bash completion for docker container
...
At this point, we just delegate to the existing completions.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a77bc8bbcf8acc40f26bd858e937a7154977943c
Component: engine
2016-10-21 12:32:08 +02:00
de91595c7f
Merge pull request #27617 from lixiaobing10051267/masterUserGuide
...
fix wrong location for network related doc files
Upstream-commit: 44dc9ef602bbf8c4daa9fa264ee0ccb25f473656
Component: engine
2016-10-20 22:28:43 -07:00
6c158febcb
Merge pull request #27613 from stevvooe/archive-package-cleanup
...
pkg/archive: remove unnecessary Archive and Reader type
Upstream-commit: bc52939b0455116ab8e0da67869ec81c1a1c3e2c
Component: engine
2016-10-20 20:56:23 -07:00
f2a96efba0
fix wrong location for network related doc files
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: c0260766588ed4c2c82cca2384d8ae30ac10b362
Component: engine
2016-10-21 11:27:24 +08:00
5e6ef3def9
revendor go-units to update more accurate time display
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 3cff9e0267780427b74f1b106798d9bb3c112eb2
Component: engine
2016-10-21 11:05:11 +08:00
dda143061b
Merge pull request #27531 from AkihiroSuda/nit-api125-changelog
...
[nit] add missing changes in API v1.25 (prune) to docker_remote_api.md
Upstream-commit: 015c2d32ee8f963065fde9755fb62dc8ff44cc19
Component: engine
2016-10-20 19:37:15 -07:00
fe1dce6a91
pkg/archive: remove unnecessary Archive and Reader type
...
The `archive` package defines aliases for `io.ReadCloser` and
`io.Reader`. These don't seem to provide an benefit other than type
decoration. Per this change, several unnecessary type cases were
removed.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: aa2cc18745cbe0231c33782f0fa764f657e3fb88
Component: engine
2016-10-20 19:31:24 -07:00
593f92302a
Merge pull request #27564 from mlaventure/add-networks-format-to-ps
...
Add Networks placeholder to ps --format
Upstream-commit: d98f995d7d191f8ae7ab0c442eed92f67faa305b
Component: engine
2016-10-20 18:43:46 -07:00
1a658fb45c
add missing changes in API v1.25 (prune) to docker_remote_api.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: afb21776313eb88b7ca691e224832ddb28cb2bb3
Component: engine
2016-10-21 01:33:08 +00:00
2d76ea3864
Merge pull request #27530 from allencloud/change-join-role-display-judge
...
change join node role judge
Upstream-commit: 392b816199836c6cd0fe214b157d70c77b72105b
Component: engine
2016-10-20 17:46:08 -07:00
4cc0262d8c
added editorconfig
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com >
Upstream-commit: 962f3479239b2dd5bfd960bc3a35199a49371d8e
Component: engine
2016-10-20 22:18:16 -02:00
Sebastiaan van Stijn
Kenfe-Mickaël Laventure
Victor Vieux
Victor Vieux
Sebastiaan van Stijn
Gerwim
Misty Stanley-Jones
Vincent Demeester
Harald Albers
Antonio Murdaca
Aaron Lehmann
lixiaobing10051267
allencloud
Stephen J Day
Akihiro Suda
Tõnis Tiigi
Carlos Alexandro Becker