John Howard
9d7f6bb921
Merge pull request #21733 from Microsoft/sjw/updatepending
...
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 15:36:39 -07:00
Tibor Vass
76aefc18f9
Merge pull request #21691 from tonistiigi/fix-gccgo-make
...
Fix building gccgo from makefile
2016-04-06 17:31:59 -04:00
Sebastiaan van Stijn
d82e522e36
Merge pull request #21810 from aboch/vnd
...
Vendoring libnetwork v0.7.0-rc.4
2016-04-06 14:18:33 -07:00
Alexander Morozov
65464d11f1
Merge pull request #21809 from Microsoft/jjh/tp4removal
...
Windows: Remove TP4 support from main codebase
2016-04-06 14:11:33 -07:00
Stefan J. Wernli
818a5198e4
Adding postRunProcessing infrastructure for hanlding Windows Update.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-06 14:03:05 -07:00
Phil Estes
40dc921da2
Merge pull request #21805 from LK4D4/unused_stuff
...
all: remove some unused funcs and variables
2016-04-06 16:27:14 -04:00
Vincent Demeester
5709f8e422
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
2016-04-06 22:14:14 +02:00
Tibor Vass
02297d5a33
Merge pull request #21794 from coolljt0725/cleanipc_quiet
...
Don't throw error on clenaup ipc mounts if it does not exists
2016-04-06 16:10:53 -04:00
Sebastiaan van Stijn
2bbe75cdb6
Merge pull request #21783 from vieux/fix_21772
...
do not trim one char from {{.Names}} each time it is used in --format
2016-04-06 13:01:22 -07:00
Tibor Vass
8c361eb5da
Merge pull request #21723 from devimc/master
...
Fix compilation errors with btrfs-progs-4.5
2016-04-06 15:56:42 -04:00
Tibor Vass
6bd429cb2a
Merge pull request #21802 from tiborvass/carry-21716
...
Carry 21716: When container had no layer data, cleanupContainer crashed
2016-04-06 15:21:38 -04:00
Alessandro Boch
8a957bafa5
Vendoring libnetwork v0.7.0-rc.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-04-06 12:18:21 -07:00
John Howard
331c8a86d4
Windows: Remove TP4 support from main code
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-06 12:12:20 -07:00
Brian Goff
40ccb7114e
Merge pull request #21768 from shishir-a412ed/fix_docker_run
...
Ignore os.IsNotExist errors when calling ToDiskLocking
2016-04-06 14:12:38 -04:00
Victor Vieux
68ade49ada
do not trim one char from {{.Names}} each time it is used in --format
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 11:04:13 -07:00
Alexander Morozov
27f50c40e6
Merge pull request #21804 from mlaventure/arm-fix
...
Skip migration unit test on non amd64 platform
2016-04-06 11:01:23 -07:00
Tibor Vass
a79e79c58e
Merge pull request #21780 from sanimej/libn-v0.7rc2
...
Vendor Libnetwork v0.7.0-rc.3
2016-04-06 13:54:21 -04:00
Alexander Morozov
5ee8652a21
all: remove some unused funcs and variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-04-06 10:40:01 -07:00
Sebastiaan van Stijn
636e7760e2
Merge pull request #21787 from npcode/fix-docs-plugin-api-markdown
...
Fix incorrect markdown rendering
2016-04-06 10:18:11 -07:00
Sebastiaan van Stijn
3d800dc019
Merge pull request #21712 from yongtang/21335-docs-container-with-volumes
...
Remote API docs give incorrect example for creating a container with volumes.
2016-04-06 10:15:37 -07:00
Kenfe-Mickael Laventure
cf73ebf280
Skip migration unit test on non amd64 platform
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-06 10:10:58 -07:00
Sebastiaan van Stijn
bbcbed3b54
Merge pull request #21799 from coolljt0725/fix_docs
...
Correct the description of --group-add in run.md
2016-04-06 10:02:32 -07:00
Sebastiaan van Stijn
0e5694412b
Merge pull request #21790 from thaJeztah/carry-21241-explain-build-cache
...
[carry 21241] explain the impact on build caching more clearly
2016-04-06 10:00:11 -07:00
mYmNeo
0bfc9c8de0
when container had no layer data, cleanupContainer crashed
...
Signed-off-by: mYmNeo <thomassong@tencent.com>
2016-04-06 12:40:20 -04:00
mYmNeo
ce87de21a7
fix TestCreateShrinkRootfs and TestCreateShrinkRootfs
...
Signed-off-by: mYmNeo <thomassong@tencent.com>
2016-04-06 12:40:20 -04:00
mYmNeo
90f512427f
fix test requirement about devicemapper and not overlay
...
Signed-off-by: mYmNeo <thomassong@tencent.com>
2016-04-06 12:40:19 -04:00
Tibor Vass
c7cf245053
Merge pull request #21751 from tonistiigi/runc-maskedpaths
...
Define readonly/mask paths in spec
2016-04-06 12:16:28 -04:00
Shishir Mahajan
606cf5310d
Ignore os.IsNotExist errors when calling ToDiskLocking
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-04-06 11:17:56 -04:00
John Howard
f3da0c9055
Merge pull request #21669 from msabansal/expose
...
Enabling expose support for Windows TP5
2016-04-06 07:52:07 -07:00
Brian Goff
e24673def2
Merge pull request #21795 from mountkin/refactor-init
...
refactor the init function in docker_utils.go
2016-04-06 10:39:55 -04:00
Brian Goff
891023617a
Merge pull request #21779 from Microsoft/jjh/dockerfile
...
Windows: Dockerfile for TP5
2016-04-06 10:23:53 -04:00
Brian Goff
c760ea3d93
Merge pull request #21785 from Microsoft/jjh/nodeletenat
...
Windows: integration-cli don't delete nat
2016-04-06 10:20:58 -04:00
Lei Jitang
9a7f2e7268
Correct the description of --group-add in run.md
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-04-06 21:52:10 +08:00
Shijiang Wei
50d5d55f56
refactor the init function in docker_utils.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-04-06 20:16:00 +08:00
Lei Jitang
5bd1786387
Don't throw error on clenaup ipc mounts if it does not exists
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-04-06 07:34:31 -04:00
mikelinjie
66b8714da4
make the cache miss clear
...
Signed-off-by: mikelinjie <294893458@qq.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-06 00:48:21 -07:00
Lei Jitang
bb9b17314d
Merge pull request #21789 from npcode/docs-plugins-authorization-null
...
Use 'null' instead of 'nil' for json
2016-04-06 15:29:40 +08:00
Yi EungJun
2f69d7689d
Use 'null' instead of 'nil' for json
...
When describe json response, 'null' is better than 'nil' which is not in
json specification.
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-04-06 16:13:48 +09:00
Yi EungJun
4a698c9c43
Fix incorrect markdown rendering
...
The docker document site [1] rendered the list of plugin implements
incorrectly.
[1]: https://docs.docker.com/engine/extend/plugin_api
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-04-06 15:37:49 +09:00
Santhosh Manohar
5b892819a6
Vendor Libnetwork v0.7.0-rc.3
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-04-05 22:01:19 -07:00
Aaron Lehmann
81b01b44c6
Merge pull request #21767 from allencloud/fix-typos
...
fix typos
2016-04-05 20:32:14 -07:00
allencloud
34700cc1f3
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-04-06 10:35:01 +08:00
John Howard
d6ab2ad36d
Windows: integration-cli don't delete nat
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-05 19:29:43 -07:00
John Howard
83809de7d4
Windows: Dockerfile for TP5
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-05 19:08:20 -07:00
John Howard
fc9912fd00
Merge pull request #21272 from Microsoft/jstarks/manifest_updates
...
Add os_version and os_features to Image
2016-04-05 16:16:25 -07:00
Alexander Morozov
806a8e22b9
Merge pull request #21755 from cpuguy83/bytespipe_allocs
...
Improve performance/reduce allocs of bytespipe
2016-04-05 14:43:57 -07:00
Brian Goff
9a25b1d942
Improve performance/reduce allocs of bytespipe
...
Creates a `fixedBuffer` type that is used to encapsulate functionality
for reading/writing from the underlying byte slices.
Uses lazily-loaded set of sync.Pools for storing buffers that are no
longer needed so they can be re-used.
```
benchmark old ns/op new ns/op delta
BenchmarkBytesPipeWrite-8 138469 48985 -64.62%
BenchmarkBytesPipeRead-8 130922 56601 -56.77%
benchmark old allocs new allocs delta
BenchmarkBytesPipeWrite-8 18 8 -55.56%
BenchmarkBytesPipeRead-8 0 0 +0.00%
benchmark old bytes new bytes delta
BenchmarkBytesPipeWrite-8 66903 1649 -97.54%
BenchmarkBytesPipeRead-8 0 1 +Inf%
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-05 13:06:04 -04:00
Vincent Demeester
83bc8d2b8c
Merge pull request #21763 from larsbutler/names-generator-comment-typo-fix
...
Fix spelling error in names-generator.go
2016-04-05 13:58:14 +02:00
Lars Butler
0cad90911f
Fix spelling error in names-generator.go
...
Signed-off-by: Lars Butler <Lars.Butler@gmail.com>
2016-04-05 12:34:52 +02:00
Vincent Demeester
8d31b0f051
Merge pull request #21719 from senk/21710-fix-client-help-text
...
Fixing help text of "docker network --help" to be consistent
2016-04-05 09:38:35 +02:00