6024fc4d49
Merge pull request #22000 from runcom/malformed-host-header-upstream
...
Ignore invalid host header between go1.6 and old docker clients
2016-05-20 08:34:00 +02:00
de908dfd2c
Merge pull request #22842 from wendelfleming/FixWorkDir
...
builder: fixed workdir comment
2016-05-19 15:23:45 -07:00
131161bbc7
builder: fixed workdir comment
...
Signed-off-by: Wendel Fleming <wfleming@usc.edu>
2016-05-19 15:40:46 -05:00
3d6f5984f5
Ignore invalid host header between go1.6 and old docker clients
...
BenchmarkWithHack-4 50000 37082 ns/op 44.50
MB/s 1920 B/op 30 allocs/op
BenchmarkNoHack-4 50000 30829 ns/op 53.52
MB/s 0 B/op 0 allocs/op
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-19 21:07:45 +02:00
376c15bbaa
Merge pull request #22762 from wangxing1517/fix_mistake_400_for_500
...
Fix bug which mistakes 400 error for 500
2016-05-19 12:04:52 -07:00
ebeb5a0422
Merge pull request #22481 from mrunalp/pid_container
...
Add support for --pid=container:<id>
2016-05-19 19:00:40 +02:00
beca261578
Fix bug which mistakes 400 error for 500
...
Signed-off-by: Wang Xing <hzwangxing@corp.netease.com>
2016-05-19 20:01:55 +08:00
1691fe6d23
Merge pull request #22821 from zunayed/patch-1
...
fix duplicate command in uninstall instructions
2016-05-18 22:26:25 +02:00
160a6430a9
fix duplicate command in uninstall instructions
...
Signed-off-by: Zunayed Ali <zunayed@gmail.com>
2016-05-18 20:12:29 +00:00
083dcd9c64
Merge pull request #22812 from thaJeztah/variable-typo
...
fix typo in variable
2016-05-18 12:04:21 -07:00
04eaa74901
Merge pull request #22712 from swernli/update_fix
...
Fixing Windows update logic.
2016-05-18 12:00:10 -07:00
aac6008800
fix typo in variable
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-18 15:26:16 +02:00
af705ca0ae
Merge pull request #22765 from cyphar/update-boltdb
...
vendor: bump boltdb to v1.2.1
2016-05-18 06:03:02 -07:00
9751170f08
Merge pull request #22778 from DoraALin/10972-docs-Support-for-non-proxied-private-registry
...
doc:http pkg variables info added in pull cmd
2016-05-18 13:58:24 +02:00
60940b0818
doc:proxy-setting info added in pull cmd.
...
Replace Note with a new secion, reduce characters in
per line in 80. Add statement suggested by
https://github.com/thaJeztah
Signed-off-by: Lin Lu <doraalin@163.com>
2016-05-18 18:16:22 +08:00
cbc404a083
Merge pull request #22785 from runcom/fix-flaky-network
...
TestPsGroupPortRange: allocate less ports
2016-05-18 11:08:10 +02:00
14b5a50f0a
Merge pull request #22582 from aboch/vnd
...
Vendoring libnetwork b66c038
2016-05-18 10:55:28 +02:00
fb43ef649b
Add support for --pid=container:<id>
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-05-17 13:49:05 -04:00
28a436af36
Merge pull request #22768 from mansinahar/run-cmd-doc
...
Update 'run' command doc for better readability. Issue:#22721
2016-05-17 17:06:12 +02:00
713b9541f5
Merge pull request #22788 from thaJeztah/fix-typo-in-completion
...
Fix typo in zsh completion
2016-05-17 08:26:25 -05:00
09cb57b773
Fix typo in zsh completion
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-17 13:38:46 +02:00
bdb354f19b
TestPsGroupPortRange: allocate less ports
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-17 12:23:37 +02:00
a7781b130c
vendor: bump boltdb to v1.2.1
...
This includes a fix to soft database corruption that would cause Docker
to fail to start if the daemon died in the middle of a transaction
write.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-05-17 16:19:35 +10:00
6eb2b903a3
Docker changes for libnetwork vendoring b66c038
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
1f9e3815aa
Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
ebcf785f2f
Update libnetwork dependencies for b66c038
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-05-16 15:04:01 -07:00
4c6838137c
Merge pull request #22728 from Microsoft/jstarks/improve_import
...
Windows: reexec during layer import
2016-05-16 11:08:05 -07:00
01c9b968bd
Update 'run' command doc for better readability
...
Signed-off-by: Mansi Nahar <mansi.nahar@macbookpro-mansinahar.local>
2016-05-16 12:49:18 -04:00
0088b8fbbe
Merge pull request #22561 from cpuguy83/delay_start_for_discovery
...
Wait for discovery on container start error
2016-05-16 09:57:19 -04:00
16e6211cf7
Merge pull request #22761 from hqhq/hq_check_config_kmem
...
Update check_config for MEMCG_KMEM
2016-05-16 12:38:21 +02:00
37dfd8bc8c
Merge pull request #22757 from gondor/master
...
Documentation: Updated URL to plugin reference - docker-volume-netshare
2016-05-16 08:39:31 +02:00
27d7b135d4
Update check_config for MEMCG_KMEM
...
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default
since 4.6, so it's merged to CONFIG_MEMCG.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-05-16 13:55:24 +08:00
7b3dc03b66
update URL for docker-volume-netshare
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
2016-05-15 21:20:54 -07:00
6e12d0720f
Merge pull request #22751 from igrcic/docs-small-typo-reference-attach
...
remove double "using" in reference attach docs
2016-05-16 01:22:43 +02:00
0884dca124
remove double "using" in reference attach docs
...
Signed-off-by: Ivan Grcic <igrcic@gmail.com>
2016-05-15 23:18:01 +02:00
1bcc42e038
Merge pull request #22742 from yongtang/05142016-update-deprecated-docs-for-LXC-built-in-exec-driver
...
Update deprecated docs for LXC built-in exec driver
2016-05-15 05:47:09 +02:00
1391e75d45
Update deprecated docs for LXC built-in exec driver
...
The LXC built-in exec driver has been deprecated in 1.8 and
further removed in 1.10, yet in deprecated.md it still shows:
```
Target For Removal In Release: v1.10
```
This fix changes the above to `Removed In Release:`.
In addition, lxc-conf flag and API fields have already been
removed in 1.10 as well so the related description has also been
updated in this fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-14 17:30:19 -07:00
e333675cd7
Merge pull request #22743 from yongtang/05142016-typo-in-work-with-networks
...
Fix a typo in work-with-networks.md
2016-05-15 02:15:45 +02:00
414b9dea8a
Fix a typo in work-with-networks.md
...
This fix fixes a typo in the documentation of `work-with-networks.md`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-14 16:58:18 -07:00
fbf3741f0d
Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label
...
Add zsh completion for 'docker network ls --filter label'
2016-05-14 22:27:00 +02:00
c80f926997
Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent
...
Add zsh completion for 'docker daemon --max-concurrent-downloads --ma…
2016-05-14 22:25:59 +02:00
14348e9cca
Merge pull request #22738 from sdurrheimer/zsh-completion-logs-details
...
Add zsh completion for 'docker logs --details'
2016-05-14 22:25:05 +02:00
afca8a454a
Add zsh completion for 'docker network ls --filter label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:38:39 +02:00
bf9a1d5027
Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:20:20 +02:00
dcca0f6dd1
Add zsh completion for 'docker logs --details'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:13:01 +02:00
89bb4d96e4
Merge pull request #22737 from tkopczynski/typo-imagesandcontainers
...
Small fix in images and containers docs
2016-05-14 17:57:45 +02:00
d0ab1c360f
Small fix in images and containers docs
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-14 16:09:49 +02:00
aa197f147d
Merge pull request #22735 from yongtang/22463-22590-emit-docker-daemon-reload-event
...
Vendor engine-api to allow docker daemon reload event
2016-05-14 11:49:01 +02:00
2f94a367d7
Merge pull request #22720 from thaJeztah/fix-markdown
...
Fix Markdown formatting in Devicemapper docs
2016-05-14 10:12:15 +02:00
d365c0e151
Fix failed test for TestRestartPolicy
...
This commit is a follow up of the last commit:
Vendor engine-api to allow docker daemon reload event.
After vendor/engine-api has been updated, the following
unit test fails:
```
--- FAIL: TestRestartPolicy (0.00s)
hostconfig_test.go:177: RestartPolicy.IsNone for { 0} should have been false but was true
```
The reason for the above failed unit test is that pull request:
https://github.com/docker/engine-api/pull/200
updated behavior of the restart policy and makes restartpolicy.IsNone
return true if restart policy name is `""`. As a result, the above
mentioned unit test fails.
This fix fixes the inconsistency of the unit test so that `TestRestartPolicy`
could pass again.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-13 20:39:35 -07:00
Vincent Demeester
Alexander Morozov
Wendel Fleming
Antonio Murdaca
Wang Xing
Sebastiaan van Stijn
Zunayed Ali
John Howard
Sebastiaan van Stijn
Lin Lu
Mrunal Patel
Brian Goff
Aleksa Sarai
Alessandro Boch
mansinahar
Tibor Vass
Antonio Murdaca
Qiang Huang
Jeremy Unruh
Ivan Grcic
Yong Tang
Steve Durrheimer
Tomasz Kopczynski