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

2855 Commits

Author SHA1 Message Date
Nishant Totla 4db4e951c7 Merge pull request #2031 from allencloud/fix-minor-typo 
fix minor typo
 2016-03-27 18:36:32 -07:00
Nishant Totla a3b84856e8 Merge pull request #2035 from allencloud/fix-typo-in-changelog 
fix typo in changelog.md
 2016-03-27 18:35:15 -07:00
Xian Chaobo 78f239ba1e Merge pull request #2028 from allencloud/log-err-when-starting-rescheduled-container-fails 
output error when starting a rescheduled container fails
 2016-03-28 09:30:13 +08:00
Sun Hongliang 8751437324 fix typo in changelog.md 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-26 22:17:07 +08:00
Sun Hongliang da7128cc16 fix minor typo 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-26 10:33:11 +08:00
Victor Vieux a5cba297ed Merge pull request #2025 from vieux/watchdog_primary 
enable rescheduling watchdog only when primary
 2016-03-25 14:46:38 -07:00
Nishant Totla 195b55d06c Merge pull request #2016 from dongluochen/Dockerbug14203 
Skip unstable tests from Docker bug 14203
 2016-03-25 11:14:53 -07:00
Morgan Bauer 3990430ab1 Merge pull request #2013 from allencloud/add-read-lock-only-when-necessary 
add read lock for eventsHandler when only it is necessary.
 2016-03-25 10:32:38 -07:00
Sun Hongliang ec0c3f7bbd output error when starting a rescheduled container fails. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-25 19:28:46 +08:00
Sun Hongliang c04cae5bf0 add read lock for eventsHandler when only it is necessary. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-03-25 08:58:45 +08:00
Nishant Totla 510ea94890 Merge pull request #2022 from pietervisser/patch-1 
Fixes typo in docs 03-create-cluster.md
 2016-03-24 13:34:36 -07:00
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
Pieter f208be4b95 Fixes typos in docs 'Swarm at scale' 
Minor typos

Signed-off-by: Pieter Visser <pieter@pietervisser.nl>
 2016-03-24 17:55:47 +01:00
Victor Vieux ffba4054dc enable rescheduling watchdog only when primary 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-03-24 06:34:05 -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
Dong Chen 96980d954d Skip unstable tests from Docker bug 14203. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-03-23 18:30:21 -07: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