Commit graph

21967 commits

Author SHA1 Message Date
Vincent Demeester
bc08203314 Merge pull request #19948 from Microsoft/jjh/testclirm
Windows CI: Port docker_cli_rm_test.go
2016-02-03 15:05:21 +01:00
Sebastiaan van Stijn
f37e10aee3 Merge pull request #19961 from coolljt0725/check_nil
1.10.0-rc3: Check nil before set resource.OomKillDisable
2016-02-03 14:52:18 +01:00
Sebastiaan van Stijn
0736dba624 Merge pull request #19947 from Microsoft/jjh/testclistart
Windows CI: Port docker_cli_start_test.go
2016-02-03 13:40:55 +01:00
Sebastiaan van Stijn
b75d0929b1 Merge pull request #19914 from coolljt0725/fix_top_restart
Fix docker top a restarting container
2016-02-03 11:28:10 +01:00
Lei Jitang
09a33b5f60 Check nil before set resource.OomKillDisable
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-03 04:31:00 -05:00
Vincent Demeester
4ef06e9ef1 Merge pull request #19946 from Microsoft/jjh/stats
Windows: Turn off stats
2016-02-03 09:28:25 +01:00
Vincent Demeester
052e5f222e Merge pull request #19940 from bfirsh/add-1.10-migration-docs
Add 1.10 migration docs
2016-02-03 08:52:17 +01:00
Sebastiaan van Stijn
f3263201ab Merge pull request #19951 from icecrime/18546_carry
Carry #18546
2016-02-03 08:51:54 +01:00
David Calavera
d2bc2f081f Merge pull request #19945 from amitkris/master
bump logrus to v0.9.0
2016-02-02 21:10:30 -08:00
Arnaud Porterie
fa160753c1 Merge pull request #19954 from Microsoft/jjh/disableclientsetstls
Disable flakey TestClientSetsTLSServerName
2016-02-02 20:09:16 -08:00
John Howard
6b8341a2d5 Disable flakey TestClientSetsTLSServerName
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 19:56:31 -08:00
Arnaud Porterie
2fd35de274 Fix typo
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-02 19:07:58 -08:00
Troy Denton
0e14754766 Update networkingcontainers.md
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.

Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com>
2016-02-02 19:05:55 -08:00
John Howard
07fd173225 Windows CI: Port docker_cli_rm_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 18:43:50 -08:00
John Howard
b47749102d Windows CI: Port docker_cli_start_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 18:23:29 -08:00
Lei Jitang
5566ccb7aa Fix docker top a restarting container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-02 21:05:01 -05:00
John Howard
55268f4e91 Windows: Turn off stats
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 17:59:11 -08:00
Ben Firshman
c8f263c73d Add 1.10 migration docs
Originally from https://blog.docker.com/2016/01/docker-1-10-rc/

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-02 17:54:33 -08:00
Amit Krishnan
408092e56b bump logrus to v0.9.0
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
2016-02-02 17:53:51 -08:00
Arnaud Porterie
6f88a3d7d3 Merge pull request #19939 from Microsoft/jjh/testcreate
Windows CI: TestCreate* porting
2016-02-02 17:48:43 -08:00
Alexander Morozov
c2bf90eb59 Merge pull request #19935 from Microsoft/jjh/onemorereliabilityhack
Windows CI: One more reliability hack
2016-02-02 16:49:29 -08:00
Alexander Morozov
1bc4c99372 Merge pull request #19761 from HackToday/enhancesortattr
Sort the attributes for events
2016-02-02 16:08:23 -08:00
John Howard
5e3fdd3c20 Windows CI: TestCreate* porting
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 16:00:39 -08:00
Alexander Morozov
83ee24e52b Merge pull request #19911 from Microsoft/jstarks/npipe
Windows: Add support for named pipe protocol
2016-02-02 15:59:45 -08:00
Arnaud Porterie
85a32baa3b Merge pull request #19901 from calavera/debug_cli_tests
Always show debug information in the info output
2016-02-02 15:56:55 -08:00
Arnaud Porterie
5ba3edd486 Merge pull request #19915 from wenchma/add_net_bind_test
Add integration test for network host bind option
2016-02-02 15:34:13 -08:00
Antonio Murdaca
2a35a1a6dc Merge pull request #19936 from vieux/fix_min_version
fix error message on version too low
2016-02-03 00:21:07 +01:00
Alexander Morozov
01cc315322 Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
2016-02-02 14:56:51 -08:00
Alexander Morozov
67d6154cc2 Merge pull request #19917 from WeiZhang555/add-lock
Lock container when set state to restarting
2016-02-02 14:55:51 -08:00
Victor Vieux
0fd9b4067d fix error message on version too low
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 14:16:15 -08:00
David Calavera
9f315dd328 Add regression tests for client debug flag.
- Add client debug info to the `docker info` command.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-02 16:57:36 -05:00
John Howard
14c53160d7 Windows CI: One more reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 13:15:35 -08:00
Tibor Vass
b6a6ed7200 Merge pull request #19932 from calavera/fix_config_validation
Make sure flat options are not parsed as config structures.
2016-02-02 15:36:25 -05:00
David Calavera
b6766e3063 Make sure flat options are not parsed as config structures.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-02 14:45:37 -05:00
Brian Goff
51620020af Merge pull request #19927 from jfrazelle/update-comment
update comment
2016-02-02 14:37:43 -05:00
Arnaud Porterie
6b7a3f0c82 Merge pull request #19926 from Microsoft/jjh/refixcihack
Windows CI: Re-do TP4 CI reliability hack
2016-02-02 11:02:08 -08:00
Sebastiaan van Stijn
f830cec78a Merge pull request #19868 from HackToday/fixwindows
Fix windows CI test
2016-02-02 19:58:29 +01:00
Tibor Vass
6bde64ab2d Merge pull request #19894 from samneirinck/powershell-support
Add powershell completion support
2016-02-02 13:50:45 -05:00
Tibor Vass
b6168e6845 Merge pull request #19929 from icecrime/delegation_exp
Delegation is not experimental
2016-02-02 13:41:44 -05:00
Arnaud Porterie
e516b5651b Delegation is not experimental
Change wording that described user delegation as an experimental
feature.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-02 10:32:14 -08:00
Arnaud Porterie
7abc7b383c Merge pull request #18605 from fgimenez/9969-add-sni-support
Added cli SNI integration test
2016-02-02 10:12:44 -08:00
Jessica Frazelle
9b8d328666
update comment
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-02 10:03:52 -08:00
Tianon Gravi
63ad7df2aa Merge pull request #19851 from hqhq/hq_remove_libseccompa
Cleanup libseccomp.a hack since dockerinit is gone
2016-02-02 09:52:35 -08:00
John Howard
6f0831930f Windows CI: Re-do TP4 CI reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 09:36:18 -08:00
Sebastiaan van Stijn
202cccc3d3 Merge pull request #19924 from moxiegirl/title-per-scott
Changing menu label from Engine > Docker Engine
2016-02-02 18:14:37 +01:00
Sebastiaan van Stijn
6144d24b03 Merge pull request #19923 from thaJeztah/update-etc-hosts-docs
Add note about legacy links
2016-02-02 18:09:22 +01:00
Sebastiaan van Stijn
1cfab85c0e Add note about legacy links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-02 18:06:09 +01:00
Mary Anthony
c49b6ce4e1 Changing menu label from Engine > Docker Engine
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-02 09:03:45 -08:00
Sebastiaan van Stijn
4d4c284ef4 Merge pull request #19817 from icecrime/breaking_changes
Add doc page for breaking changes
2016-02-02 17:43:32 +01:00
Vincent Demeester
ef52a53c34 Merge pull request #19865 from mavenugo/ndocs
Docs cleanup for networking features added in 1.10
2016-02-02 17:36:46 +01:00