docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,841 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2841 Commits

Author SHA1 Message Date
Dongluo Chen 69c44967be Merge pull request #2017 from allencloud/fix-typos-in-mesos 
fix typos in /swarm/cluster/mesos/cluster.go
 2016-03-24 10:12:11 -07:00
Xian Chaobo dcf2608798 Merge pull request #1992 from dongluochen/AddNodeSpecUpdate 
Periodically update node spec
 2016-03-24 20:36:32 +08:00
Sun Hongliang 3843dbb381 fix typos in /swarm/cluster/mesos/cluster.go 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-24 10:49:28 +08:00
Nishant Totla ef1c777887 Merge pull request #2010 from dongluochen/ReleaseDocUpdate 
small updates to RELEASE-CHECKLIST.md
 2016-03-22 17:26:24 -07:00
Dong Chen 5f08cabef6 update RELEASE-CHECKLIST.md 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 17:14:19 -07:00
Dongluo Chen 027b34a2bc Merge pull request #2009 from dongluochen/bump-1.2.0-rc1 
Bump version to 1.2.0-rc1
 2016-03-22 16:18:51 -07:00
Dong Chen 27cf675aba Bump version to 1.2.0-rc1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 16:14:53 -07:00
Dongluo Chen 1d17bc6d37 Merge pull request #2004 from dongluochen/DuplicateNetworkEndpoints 
Skip redundant endpoints in "network inspect"
 2016-03-22 14:52:25 -07:00
Dong Chen 0436dd1f26 An endpoint is duplicate/stale if its ID is part of endpoint index. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 14:10:57 -07:00
Victor Vieux 7e1bcc36e5 Merge pull request #2006 from p8952/master-to-manager 
Change "master" to "manager"
 2016-03-22 11:37:30 -07:00
Peter Wilmott 4b0b029ce2 Change "master" to "manager" 
The Docker Swarm documentation states that:

"Some documentation still refers to a primary manager as a “master”, but
that term has been superseded."

This change attempts to remove remaining references to "master" in order
to keep documentation consistent.

Signed-off-by: Peter Wilmott <p@p8952.info>
 2016-03-22 17:50:00 +00:00
Dong Chen d045bd44e0 Skip redundant endpoints in "network inspect" 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-22 10:19:22 -07:00
Dongluo Chen 11f42c3c2f Merge pull request #1999 from allencloud/remove-parameter-in-createDiscovery 
remove parameter which is not used in createDiscovery
 2016-03-21 14:11:42 -07:00
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
Dong Chen 040f63cd47 Force node spec update. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-18 10:23:39 -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