e168bb6f35
Merge pull request #19346 from albers/completion-detach-keys
...
Completion and docs update for --detach-keys
Upstream-commit: 33a06a7f05ce660ab307f5b392a2abad96748566
Component: engine
2016-01-14 14:40:44 -08:00
198f38f301
Document that detach keys are a list of key bindings
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3bf821054e1d7681ae76ec3dbba8ea81f4dc5adf
Component: engine
2016-01-14 13:58:41 -08:00
4a4ab3133f
Merge pull request #19339 from cpuguy83/19335_revert_18736
...
Revert "Break big lock into some tiny locks"
Upstream-commit: 9365b301a821a95e36589c990a36ea4c619b9ba1
Component: engine
2016-01-14 16:53:39 -05:00
035da2c40e
Merge pull request #19325 from mingqing/fix-pid-convert-error
...
fix pidfile, pid is num use '/proc + string(pid)' can't found it
Upstream-commit: 3b6a989d815cc1acc23a0d7b775abda337b464d6
Component: engine
2016-01-14 16:49:20 -05:00
f10d08e793
bash completion for --detach-keys
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b24ded193f7175e7f63e2bb8432b430a6665bfdf
Component: engine
2016-01-14 13:47:20 -08:00
57bedb0b2d
Merge pull request #17316 from rmb938/ipam_conf_options
...
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
2016-01-14 16:30:03 -05:00
390716081e
Merge pull request #19343 from Microsoft/jjh/dockerfilenote
...
Add note in dockerfile about go version
Upstream-commit: 0f2ba97a787950838f0f762ed4d9cc8403862f24
Component: engine
2016-01-14 13:11:03 -08:00
6450022b83
Merge pull request #19342 from Microsoft/jjh/fix19316
...
Windows: Fix test regression from 19155
Upstream-commit: d299bbfcc62e510c7a485672aacc245bcbd2198a
Component: engine
2016-01-14 13:05:47 -08:00
bc77bba632
Merge pull request #19338 from aboch/vnd
...
Vendoring libnetwork v0.5.5
Upstream-commit: db2b5e647c8cd5a2dd0d853785f8c3a2fc9cbbfc
Component: engine
2016-01-14 13:02:20 -08:00
b938aebf84
Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog
...
Remove the changelog auto-generation
Upstream-commit: 7a442651292a32316d5ba0bf018f9cf8444e7717
Component: engine
2016-01-14 12:47:32 -08:00
8735a147d2
Add note in dockerfile about go version
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6c1382e151676ada408d89d6e197dbcf47dc4ebd
Component: engine
2016-01-14 12:20:19 -08:00
a939b26632
Windows: Fix test regression from 19155
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d3392a3bdecca4b79e1ea942595f05c03fcd5995
Component: engine
2016-01-14 12:00:27 -08:00
f8714c52f0
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com >
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
2016-01-14 14:32:25 -05:00
59828f1612
Merge pull request #19333 from wzyboy/patch-1
...
Update CHANGELOG.md
Upstream-commit: 3ce3fb7417a09662fefdd4cee06d9b9009af1b35
Component: engine
2016-01-14 11:21:32 -08:00
f2aa94a27b
Merge pull request #19326 from HackToday/19153-filter-rethink
...
Fix image filter
Upstream-commit: 7cd6210a88006da21529aeccadea79c9ce720abb
Component: engine
2016-01-14 13:59:14 -05:00
082c746378
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
2016-01-14 10:58:51 -08:00
49a1d12f12
Revert "Break big lock into some tiny locks"
...
This reverts commit 1326f0cba5f933674e23769de1385d3b0841e758.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f093e1273d7d030a24045d97a78fec8637f46bf8
Component: engine
2016-01-14 13:38:09 -05:00
b8b2e1e984
Vendoring libnetwork v0.5.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4e4ba9dd3a1d488cf9d808f35904ce59911a55de
Component: engine
2016-01-14 10:34:00 -08:00
ded6ab4c78
Merge pull request #19323 from wenchma/19089-add_network_id
...
Add network ID to container inspect
Upstream-commit: 812d95cdfb78f4063b967b23911ed3ef152ad533
Component: engine
2016-01-14 09:58:24 -08:00
af7fec7cd7
Merge pull request #19226 from coolljt0725/remove_dup_check
...
Remove duplication checking for the existence of endpoint to speed up container starting
Upstream-commit: f292e90b8dcca4fabf9d6aa6d889e9fae0eca6ba
Component: engine
2016-01-14 12:24:11 -05:00
980beea08a
Merge pull request #19155 from coolljt0725/create_cwd_on_create
...
Create the working directory on container creation
Upstream-commit: a225e39667d7ddd2345326bc5cd3b1ce15fd0bad
Component: engine
2016-01-14 09:13:44 -08:00
8eb1087397
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
cfd7c2432a
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
Upstream-commit: 349d9700bd5e3bbf86ea2b7c0097b5f897e2fbc1
Component: engine
2016-01-14 11:40:29 -05:00
806650627f
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9f676ade0aef66bb66a26171d6bfb27f105fa1df
Component: engine
2016-01-14 22:33:41 +08:00
8bab3a37a3
Merge pull request #19312 from cpuguy83/19177_fix_debug_req_dump_size
...
Don't dump request body when too large
Upstream-commit: 59231ea6d8bdff3d32140d7ab28aeb98fb93ebff
Component: engine
2016-01-14 09:06:02 -05:00
da272e0828
Merge pull request #19317 from mavenugo/epforce
...
Forced endpoint cleanup
Upstream-commit: 851c94db1bafac593cf193dd9dde26cd3d9e7f23
Component: engine
2016-01-14 14:21:30 +01:00
0f98f8e081
Update CHANGELOG.md
...
Fix "smart" dashes.
Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org >
Upstream-commit: 11801100be9e6f5c67e13855bac984688d8f7c76
Component: engine
2016-01-14 20:24:24 +08:00
bb8be65a6c
Merge pull request #19157 from wenchma/update_build_bridges
...
Update the doc of build-bridges.md
Upstream-commit: 0ed2e26f51f6b82c1b476562c3ae4134c38b26e9
Component: engine
2016-01-14 11:10:37 +01:00
ae43fa875b
Merge pull request #19286 from aboch/ipdocs
...
Add missing documentation for static IP options
Upstream-commit: ec143968de233c9767854e4c7ba08b3629070696
Component: engine
2016-01-14 11:00:09 +01:00
84e80bd254
Fix image filter
...
This is related image fix for Propose #19153
for volume related change, would use another patch
to fix that.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 5ee69eb470316eead3af20725de54d3c47a47a62
Component: engine
2016-01-14 08:17:40 +00:00
ed3f8ef029
Merge pull request #19252 from HackToday/fix-vol-resp-doc
...
Update response content for volume mounts
Upstream-commit: 63525a6dc5f7be370736ec2905d40a8c8fdf1162
Component: engine
2016-01-14 09:15:13 +01:00
cc17e2f69a
fix pidfile, pid is num use '/proc + string(pid)' can't found it
...
Signed-off-by: mingqing <limingqing@cyou-inc.com >
Upstream-commit: 6a033fa03e341f8578721045a91dcbf8015982f6
Component: engine
2016-01-14 16:03:33 +08:00
985a9b7b1d
Remove the changelog auto-generation because its hardcoded in the .spec file now.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: b916d451325fc20d754f47702af34304e983a77b
Component: engine
2016-01-14 18:50:55 +11:00
b1af9c7987
Remove wrong lxc support
...
Docker master branch not support lxc, so it seems not proper to
say that anymore.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 0e8d41272c7e5979d8a3f8676c94320f6c2ff691
Component: engine
2016-01-14 07:23:04 +00:00
e5509a078a
Fix #19100 and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3d2539d39d6dd12bf3db13f4df21a997d4f7ee3b
Component: engine
2016-01-14 14:58:54 +08:00
2b7ea75ef2
Forced endpoint cleanup
...
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
2016-01-13 21:28:52 -08:00
b4989a8d3c
Merge pull request #19319 from calavera/fix_tls_config_for_response_hijacking
...
Fix response hijacking with TLS enabled.
Upstream-commit: 742a7d53f2961565f0baf43d6423383101be84c3
Component: engine
2016-01-13 21:44:11 -05:00
7237c4ead6
Add test to verify that response hijacking always works over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: db1d5f7ea37c2a3b0bedc9dbcbf5bd3b32258219
Component: engine
2016-01-13 20:18:06 -05:00
680642b7a4
Vendor engine-api 0.2.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7a5d8974109ec34e9fb752b2935077eb8da7a229
Component: engine
2016-01-13 20:09:47 -05:00
b346420514
Merge pull request #19318 from Djelibeybi/fix-selinux-rpm-changelog
...
Not having a changelog is bad RPM etiquette.
Upstream-commit: 3720fbfb35b2f8173b47c0a381cb0bdf09ae1a20
Component: engine
2016-01-13 16:00:44 -08:00
279593a3ff
Merge pull request #19313 from tiborvass/bump-go-1.5.3
...
Bump Go to version 1.5.3
Upstream-commit: a79307c49037b036d4198812a2de83fe8fe2e450
Component: engine
2016-01-13 15:59:19 -08:00
e4291809ce
Not having a changelog is bad RPM etiquette.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 22af8dfb14d7cc9eb91964ed187a074658f57005
Component: engine
2016-01-14 10:34:48 +11:00
e45d68c9fe
Add missing documentation for static IP options
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ee14232647085ce2faf7167959728977d36e5503
Component: engine
2016-01-13 14:53:14 -08:00
2e1c787d5f
Bump Go to version 1.5.3
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9560d941142b0bd17b0aa51e4d9bfe22354732ec
Component: engine
2016-01-13 17:23:46 -05:00
0411e42a0a
Don't dump authz request when body is too large
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 93268d845e41be9cb67744c9bf7a82f8409dff04
Component: engine
2016-01-13 17:04:49 -05:00
b056e82903
Don't dump request body to log when too large
...
Fixes an issue where a client can send a large body but specifiy
application/json as the content-type, and cause Docker to consume lots
of RAM while trying to buffer the body so it can be dumped to the debug
log.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 89af3835d483fe758f301aa8f3b1062a0ab712fb
Component: engine
2016-01-13 17:01:35 -05:00
b6d75433b3
Merge pull request #19311 from estesp/no-oom-warning-when-cant-even
...
Only warn on OOMKill disable if the feature is actually requested
Upstream-commit: 9c30492e9e5cf8da5771af87d2b0a83a627ff2b4
Component: engine
2016-01-13 13:43:37 -08:00
3587269c45
Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable
...
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Upstream-commit: 661d75f39858934c230c59a68d908ef203c34136
Component: engine
2016-01-13 13:22:08 -08:00
2e91a82de6
Merge pull request #19241 from rhvgoyal/fix-device-id-free
...
Mark device ID free only if device actually got deleted
Upstream-commit: d6e01e3337a6ed1e941cf01840ee91ce55c55db4
Component: engine
2016-01-13 13:07:39 -08:00
5e9b25b836
Only warn on OOMKill disable if the feature is actually requested
...
Instead of warning the caller who is disabling OOM killer that the
feature isn't available, only warn if they are trying to **enable** OOM
killer and it can't be done.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 5a707d94d605fdf2a35d5a7033d1971b49745352
Component: engine
2016-01-13 11:53:44 -08:00
