Sebastiaan van Stijn
7c5cdda74e
Merge pull request #17604 from RyanDeng/fix_cpuPercent_extremelyHigh
...
fix the bug: cpu percent will extremely high
2015-11-16 17:26:29 +01:00
Tibor Vass
92487d7fb4
Merge pull request #17985 from Microsoft/jjh/firstboot
...
Windows: [TP4] Fix regression on second or later container starts
2015-11-16 10:03:46 +01:00
Vincent Demeester
3b1acde99b
Merge pull request #17995 from albers/completion--volume-driver
...
bash completion for `docker {run,create} --volume-driver`
2015-11-16 04:40:20 +01:00
Harald Albers
d411c47139
bash completion for docker {run,create} --volume-driver
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-15 09:53:22 -08:00
Tibor Vass
59fe485f0d
Merge pull request #17945 from tonistiigi/fix-windows-pull
...
Fix docker pull on windows
2015-11-15 12:32:25 +01:00
Sebastiaan van Stijn
cf824d9749
Merge pull request #17479 from coolljt0725/show_warning
...
Show warning when user specify dm.basesize for already initialized devicemapper driver
2015-11-15 08:51:33 +01:00
Tibor Vass
586152523d
Merge pull request #17987 from jfrazelle/correct-ltdl
...
Correct ltdl and fix experimental macro for rpms
2015-11-15 03:46:23 +01:00
Jessica Frazelle
38724c80ab
fix experimental boolean macro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 14:47:13 -08:00
Vincent Demeester
31a6e01f47
Merge pull request #17009 from azurezk/user-checkers
...
add c.Assert in docker_cli_ps_test.go
2015-11-14 20:22:15 +01:00
John Howard
8da449055f
Windows: Fix regresion on first boot
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-14 11:06:19 -08:00
Alexander Morozov
fb77b822ad
Merge pull request #17758 from rhatdan/dynbinary
...
Since default is dynbinary we should test with dynbinary
2015-11-14 10:54:03 -08:00
Jessica Frazelle
41619f4a90
correct ltdl for centos
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 08:50:58 -08:00
Antonio Murdaca
ad8a66573c
Merge pull request #17851 from Microsoft/10662-ArgumentEscaping
...
Prevent double escaping of Dockerfile commands on Windows
2015-11-14 17:25:53 +01:00
Arnaud Porterie
7a6f2cdeeb
Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
...
New version of notary with pkcs11 client integration
2015-11-14 12:03:29 +01:00
Dan Walsh
0d47b74a7f
Since default is dynbinary we should test with dynbinary
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-14 06:01:55 -05:00
Antonio Murdaca
1448cd3ec2
Merge pull request #17971 from narqo/simplify-addr-formating
...
Simplify final address formatting in parser.ParseTCPAddr
2015-11-14 08:38:09 +01:00
Antonio Murdaca
dc136b710b
Merge pull request #17211 from endocode/kayrus/docker_fd_https
...
Added possibility to use TLS with systemd socket activation
2015-11-14 08:36:54 +01:00
Michael Crosby
1f53bf9097
Merge pull request #17859 from liusdu/remove-rebundent
...
remove unnecessary logs from daemon
2015-11-13 16:45:30 -08:00
Michael Crosby
7e0a5398af
Merge pull request #17976 from Microsoft/jjh/store-test-unit
...
Windows: Pass store test-unit
2015-11-13 16:26:17 -08:00
Alexander Morozov
9b307fe369
Merge pull request #17503 from mikebrow/fix-for-rmi-id-old-local-repositories
...
putting in support for rmi id for legacy docker.io/name images in loc…
2015-11-13 16:22:30 -08:00
Michael Crosby
439633cee6
Merge pull request #17977 from Microsoft/jjh/archivewindowscomment
...
Windows: Fixes comment in archive_windows.go
2015-11-13 16:00:14 -08:00
Michael Crosby
28612c5587
Merge pull request #17978 from Microsoft/jjh/removevolumecheck
...
Windows: Remove check for volume support
2015-11-13 15:59:41 -08:00
Michael Crosby
58244392e5
Merge pull request #17979 from Microsoft/jjh/tidytodowindows
...
Remove 'TODO Windows' unnecessary comment
2015-11-13 15:59:06 -08:00
unclejack
13963957eb
Merge pull request #17877 from aaronlehmann/capped-bytespipe
...
Cap the amount of buffering done by BytesPipe
2015-11-14 00:51:11 +02:00
Alexander Morozov
5e2d4aaec2
Merge pull request #17980 from Microsoft/jjh/configuresysinit
...
Remove uncalled configureSysInit
2015-11-13 14:30:03 -08:00
Alexander Morozov
f5e318a17b
Merge pull request #17090 from duglin/dockerignoreWildcards
...
Support multi-dir wildcards in .dockerignore
2015-11-13 14:29:34 -08:00
Doug Davis
a5f3ed4801
Merge pull request #17599 from perhapszzy/master
...
Add line information in the parsed Dockerfile.
2015-11-13 16:53:59 -05:00
Doug Davis
eddb14a44e
Support multi-dir wildcards in .dockerignore
...
Closes #13113
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-13 13:44:07 -08:00
John Howard
2648655a4a
Remove uncalled configureSysInit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:43:09 -08:00
David Lawrence
52021ac2a4
fixing tests for updated CLI output
...
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-11-13 13:20:55 -08:00
Jessica Frazelle
6c818f3e5f
update for mac
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:54 -08:00
Jessica Frazelle
cf4c3da725
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:53 -08:00
Jessica Frazelle
141369457f
add buildtag pkcs11 to experimental
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:49 -08:00
Jessica Frazelle
94ea6af8cd
update vendor.sh and notary api for vendored changes
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:11 -08:00
Jessica Frazelle
a52a7a6991
update notary vendors
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:09 -08:00
John Howard
208ad80605
Remove TODO Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:07:27 -08:00
John Howard
8209571982
Windows: Remove check for volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:02:30 -08:00
John Howard
e5261d6e4a
Windows: Fixes comment
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 12:51:05 -08:00
perhapszzy@sina.com
5b6c4dd3df
Add line information in the parsed Dockerfile
...
Signed-off-by: perhapszzy@sina.com <perhapszzy@sina.com>
2015-11-13 15:41:12 -05:00
John Howard
32b905d90f
Windows: Pass store test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 12:39:43 -08:00
Alexander Morozov
4302c14a64
Merge pull request #16920 from mountkin/fix-attach-test
...
fix the flaws in the test of the attach API
2015-11-13 12:05:22 -08:00
Alexander Morozov
a4acb1db4a
Merge pull request #17615 from WeiZhang555/17404-net-inspect-name
...
Include container names in `network inspect`
2015-11-13 11:54:59 -08:00
Alexander Morozov
42fa8e3128
Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
...
Fallback to file polling for jsonlog reader on err
2015-11-13 11:49:54 -08:00
Darren Stahl
9db5db1b94
This fixes the case where arguments are escaped twice from Dockerfiles on
...
Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-13 10:43:06 -08:00
moxiegirl
f49fb07086
Merge pull request #17961 from pidster/add-weave-network-plugin
...
Add Weave Network Plugin to docs/extend/plugins.md
2015-11-13 10:12:58 -08:00
Alexander Morozov
cccf674943
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
2015-11-13 09:37:06 -08:00
Vladimir Varankin
3830359745
Simplify address formating
...
Use `net.JoinHostPort()` which count IPv6 literals in `host`,
instead of relying on `net.ParseIP(host).To4()` side effects.
Signed-off-by: Vladimir Varankin <nek.narqo@gmail.com>
2015-11-13 20:32:32 +03:00
Antonio Murdaca
c705be8e22
Merge pull request #17955 from twhiteman/issue_17952
...
integration-cli: support remote docker host that uses TLS - fixes #17952
2015-11-13 18:26:32 +01:00
Alexander Morozov
59a341ed2a
Merge pull request #17833 from rhatdan/signals
...
Define all of the signals defined by kill -l
2015-11-13 09:03:51 -08:00
kayrus
0f2b3191d9
Added possibility to use TLS with systemd socket activation
...
Signed-off-by: kayrus <kay.diam@gmail.com>
2015-11-13 17:01:23 +01:00
