centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,827 Commits 57 Branches 28 Tags
e2dbd703575c808716e0369ecedd50e087d6ce2f
Commit Graph

2827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sun Hongliang
e2dbd70357 remove parameter which is not used in createDiscovery 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-19 23:12:09 +08:00
Morgan Bauer
2de0f86b5f Merge pull request #1998 from dongluochen/HostnameUpdate 
Docker changes hostname/domain in container config
 2016-03-18 19:53:41 -07:00
Dongluo Chen
e8cfa68946 Merge pull request #1994 from allencloud/log-more-details-when-constraint-or-affinity-fails 
classify whether constraint error or affinity error
 2016-03-18 17:15:32 -07:00
Dong Chen
ee5e94fd63 Update mesos test. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-18 17:14:00 -07:00
Dong Chen
951c2d1cca Docker engine updates hostname/domainname. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-18 16:18:01 -07:00
Dongluo Chen
a4fb6f0604 Merge pull request #1997 from nishanttotla/context-plumbing 
Plumbing context through all engine-api calls
 2016-03-18 16:05:21 -07:00
Nishant Totla
1e821e48ed Plumbing context through all calls to engine-api client 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-18 14:55:05 -07:00
Nishant Totla
611f273c76 Updating Godeps (engine-api) 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-18 14:19:30 -07:00
Sun Hongliang
01fc95fe31 classify whether constraint error or affinity error 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-18 21:51:31 +08:00
Xian Chaobo
a91f1818c4 Merge pull request #1963 from allencloud/validate-duration-flag-positive 
validate duration flags: --delay, --timeout,--replication-ttl
 2016-03-18 08:55:24 +08:00
Victor Vieux
9de8f77d55 Merge pull request #1986 from allencloud/move-experiemental-about-rescheduling-out-of-config 
move more details about rescheduling out of experimental
 2016-03-17 11:00:56 -07:00
Nishant Totla
c147d3d6f0 Merge pull request #1988 from allencloud/fix-typos-in-watchdog 
fix typos in watchdog
 2016-03-17 10:54:02 -07:00
Sun Hongliang
4b04286f90 fix typos in watchdog 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-17 22:20:26 +08:00
Sun Hongliang
129f38366e move more experimental out of rescheduling 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-17 20:13:46 +08:00
Nishant Totla
73179d4dd8 Merge pull request #1985 from dongluochen/RefreshContainerAtTransitState 
Force inspect for containers in Restarting state
 2016-03-17 02:07:11 -07:00
Dong Chen
b61dfa7497 Force inspect for containers in Restarting state. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-16 18:43:37 -07:00
Victor Vieux
4cdc2556e3 Merge pull request #1984 from vieux/fix_doc_resch 
fix duplicate rescheduling.md
 2016-03-16 17:32:57 -07:00
Victor Vieux
07143cea03 fix duplicate rescheduling.md 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-03-16 17:27:32 -07:00
Victor Vieux
fc1d6a2f1d Merge pull request #1975 from moxiegirl/fix-reschedule-doc 
Updating the documentation
 2016-03-16 17:26:55 -07:00
Victor Vieux
0744188c9b Merge pull request #1981 from dongluochen/ContainerRestartEvent 
Docker restart event should trigger container inspect
 2016-03-16 17:20:18 -07:00
Dongluo Chen
85f6d57f21 Merge pull request #1972 from vieux/pass-host-config 
HostConfig for /start endpoint
 2016-03-16 17:19:29 -07:00
Dong Chen
c35d95fac4 Docker restart would change container state. Should do a container inspect to update status. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-16 16:27:35 -07:00
Victor Vieux
968aae4f9c Merge pull request #1977 from dongluochen/RetryEventMonitor 
Swarm manager should retry EventMonitoring on failure
 2016-03-16 15:59:44 -07:00
Victor Vieux
c05c7905e9 Merge pull request #1882 from dongluochen/SkipTestsWithDocker1.9Issue 
Docker issue #14203 affects nodemanagement tests in Docker 1.9.
 2016-03-16 15:50:43 -07:00
Dongluo Chen
f2a034f84e Merge pull request #1979 from vieux/fix_image_matching_via_id 
fix image matching via id
 2016-03-16 15:47:20 -07:00
Dong Chen
26931816c4 Manager should retry EventMonitoring on failure. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-16 15:35:22 -07:00
Victor Vieux
56affa1ada fix image matching via id 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-03-16 15:12:56 -07:00
Sun Hongliang
5aa339ed38 validate duration flags:--delay, --timeout,--replication-ttl 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-16 10:09:57 +08:00
Mary Anthony
b9ce995ebf Updating the documentation 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-03-15 14:06:01 -07:00
Dongluo Chen
e0b5e6f5fa Merge pull request #1933 from allencloud/compatile-api-response-status-code 
fix two swarm apis' response status code
 2016-03-15 13:36:44 -07:00
Victor Vieux
e90d93d6e7 Merge pull request #1957 from mqliang/get-warm-typo 
fix typo in get-swarm.md
 2016-03-15 13:28:37 -07:00
Victor Vieux
c142e12e79 Merge pull request #1958 from mqliang/provision-typo 
fix typo in provision-with-machine.md
 2016-03-15 13:28:09 -07:00
Nishant Totla
81b6fded58 Merge pull request #1971 from vieux/rescheduling_out 
move rescheduling out of experimental
 2016-03-15 12:00:42 -07:00
Victor Vieux
b771a7cb14 Merge pull request #1973 from dongluochen/MaxThreadCount 
Increase max thread count to 50k
 2016-03-15 11:19:37 -07:00
Xian Chaobo
66b78ef043 Merge pull request #1962 from allencloud/validate-refresh-time-interval-posotive 
force to validate min and max refresh interval to be positive
 2016-03-15 17:33:13 +08:00
Victor Vieux
b05dee4d6e HostConfig for /start endpoint 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-03-14 19:23:57 -07:00
Dong Chen
408f3cff8e Increase max thread count to 50k 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-14 18:36:48 -07:00
Dongluo Chen
e24cc12814 Merge pull request #1796 from nishanttotla/list-conflicting-constraints 
Print all constraints when container can't be scheduled
 2016-03-14 18:24:15 -07:00
Victor Vieux
082f4b65af move rescheduling out of experimental 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-03-14 17:18:36 -07:00
Nishant Totla
5075e95612 Printing entire set of unsatisfiable constraints for container scheduling 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-14 17:17:06 -07:00
Nishant Totla
ac3a8b6ac9 Adding functions to list filter constraints of all types 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-03-14 17:17:06 -07:00
Nishant Totla
2ce00c6ce9 Merge pull request #1967 from allencloud/fix-typo-it's-to-its 
fix typos
 2016-03-14 13:37:04 -07:00
Sun Hongliang
b9d0d8927f force to validate min and max refresh interval to be positive 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-15 00:29:08 +08:00
Nishant Totla
42b1620f4d Merge pull request #1966 from arunwizz/issue-1965 
Fixed typo for word consul
 2016-03-13 22:10:46 -07:00
Sun Hongliang
172048942d fix typos. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-14 11:21:59 +08:00
Nishant Totla
a80ca0e51a Merge pull request #1952 from mqliang/filter-typo 
Filter typo in document
 2016-03-13 12:02:41 -07:00
Nishant Totla
9a1133f7c7 Merge pull request #1959 from mqliang/intstall-w-typo 
fix typo in install-w-machine.md
 2016-03-13 12:01:55 -07:00
Sun Hongliang
51a63c13c8 fix three swarm api response status code 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-14 00:39:34 +08:00
Arun Y
295c4da8d0 Fixed typo for word consul 
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
660 York Street, Suite 102,
San Francisco, CA 94110 USA

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Signed-off-by: Arun Y <arunwizz@gmail.com>
 2016-03-13 19:58:29 +05:30
mqliang
aa70529d3f fix typo in install-w-machine.md 
Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2016-03-13 15:53:27 +08:00