docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
3,083 Commits 92 Branches 28 Tags
883ae9240b69a91cf5d433209ca23ff7dacaa0a3
Commit Graph

3083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit
883ae9240b hugo aliases need to be absolute 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-03 20:00:13 +00:00
Dongluo Chen
416a781b64 Merge pull request #2281 from xianlubird/feature/scheduler_log 
Add scheduler detail log for node
 2016-06-03 10:41:37 -07:00
Dongluo Chen
43fad5ab69 Merge pull request #2319 from allencloud/fix-typos 
fix typos
 2016-06-02 16:16:29 -07:00
allencloud
f62cd8c9aa fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-02 17:00:22 +08:00
xianlubird
61f3441d07 Add scheduler detail log for node info 
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
 2016-06-02 09:27:55 +08:00
Charles Smith
e69bb29b78 Merge pull request #2292 from SvenDowideit/fix-link 
fix link
 2016-05-31 15:52:08 -07:00
Dongluo Chen
1ad2e1d65b Merge pull request #2297 from allencloud/return-VolumesListResponse-in-volumes-API 
return VolumesListResponse in /volumes API
 2016-05-31 15:22:37 -07:00
Sven Dowideit
9044c5177c fix link 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-31 21:25:09 +00:00
Allen Sun
aaa4d87a4e Merge pull request #2308 from NanXiao/issue-9999 
Edited CONTRIBUTING
 2016-06-01 00:23:27 +08:00
Allen Sun
2721be2548 Merge pull request #2311 from bedeabza/docs-typos 
typo: 'loadblancer' in Swarm at scale docs
 2016-06-01 00:21:21 +08:00
Dragos Badea
4b1e08fd9d typo: 'loadblancer' in Swarm at scale docs 
Signed-off-by: Dragos Badea <bedeabza@gmail.com>
 2016-05-31 16:55:52 +03:00
Nan Xiao
e85792cfdd Edited CONTRIBUTING 
Signed-off-by: Nan Xiao <nan@chinadtrace.org>
 2016-05-31 19:30:30 +08:00
allencloud
9663b5e46f return VolumesListResponse in /volumes API 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-05-29 11:51:47 +08:00
Alexandre Beslic
13c9e87a9f Merge pull request #2262 from allencloud/remove-refreshVolumes-not-used 
remove unused refreshVolumes in cluster.go
 2016-05-27 14:10:41 -07:00
Nishant Totla
eaa53c768a Merge pull request #2257 from allencloud/fix-unit-test-command-in-CONTRIBUTION 
fix unit test command in CONTRIBUTION.md
 2016-05-26 10:44:45 -07:00
Nishant Totla
8a29fad06f Merge pull request #2282 from nishanttotla/bump-v1.2.3-rc1 
Bump version to v1.2.3-rc1
 2016-05-25 23:08:57 -07:00
Nishant Totla
cf005b3e33 Bump version to v1.2.3-rc1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-25 20:21:21 -07:00
Alexandre Beslic
7e81f14dfc Merge pull request #2272 from nishanttotla/engine-api-version-bump 
Bumping engine-api version (with RegistryAuth fix)
 2016-05-25 19:07:38 -07:00
Nishant Totla
89277806cb Fixing RegistryAuth for image pulls 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-25 17:48:14 -07:00
Nishant Totla
46ba8763be Updating unit tests for updated engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-25 16:53:02 -07:00
Nishant Totla
82f1bfe0ec Changing relevant function calls for updated engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-25 15:47:06 -07:00
Nishant Totla
8fd494ba58 Updating mock and nop clients for updated engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-24 16:27:10 -07:00
Alexandre Beslic
ff40997d68 Merge pull request #2242 from dongluochen/add_maintainer_allensun 
Add Allen Sun to MAINTAINERS file
 2016-05-24 00:06:17 -07:00
Nishant Totla
04a9533b09 Updating godeps (engine-api) 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-23 15:46:33 -07:00
allencloud
7d5ef9016d remove not used refreshVolumes in cluster.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-05-23 00:35:37 +08:00
allencloud
069339a30e fix unit test command in CONTRIBUTION.md 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-05-21 22:32:27 +08:00
Dongluo Chen
df77cf3674 Merge pull request #2236 from fugr/fix-handle-update-event 
fix missing handle 'update' event massage
 2016-05-17 10:30:31 -07:00
fugr
ae824704e5 fix missing handle 'update' event massage. 
Signed-off-by: fugr <fugr2012@gmail.com>
 2016-05-14 19:13:56 +08:00
Dong Chen
9730e04896 Add Allen Sun to MAINTAINERS file 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-13 14:21:12 -07:00
Dongluo Chen
07825a17e7 Merge pull request #2238 from SvenDowideit/Egnine 
Small spelling fix
 2016-05-13 10:21:32 -07:00
Sven Dowideit
783079aa12 Small spelling fix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-13 04:59:08 +00:00
Dongluo Chen
c5f33ecb03 Merge pull request #2230 from kolyshkin/patch-1 
install-manual: fix sec. swarm manager connect
 2016-05-11 23:34:04 -07:00
Kirill Kolyshkin
97c534cae8 install-manual: fix sec. swarm manager connect 
Apparently, without -p 4000:4000 the secondary swarm manager would be inaccessible, basically rendering it useless.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2016-05-11 14:10:09 -07:00
Dongluo Chen
45d2960226 Merge pull request #2184 from realityone/fix-reschedule-docs 
fix set reschedule policy docs
 2016-05-11 14:02:04 -07:00
Dongluo Chen
922472ae58 Merge pull request #2224 from allencloud/fix-bug-in-api-server 
fix bug that http server should return when handler is nil
 2016-05-10 13:49:43 -07:00
Xian Chaobo
765a16274f Merge pull request #2219 from allencloud/hide-field-error-when-empty 
hide error in info when empty
 2016-05-10 20:30:46 +08:00
Sun Hongliang
4ed5f96ea5 fix bug that http server should return when handler is nil 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-10 17:02:11 +08:00
realityone
fb28924a69 fix set reschedule policy docs 
Signed-off-by: realityone <realityone@me.com>
 2016-05-10 13:15:36 +08:00
Sun Hongliang
b1f42fb8cc hide error in info when empty 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-08 15:32:19 +08:00
Dongluo Chen
34e3da3acd Merge pull request #2215 from joelhandwell/patch-1 
Krane project has been closed in favor of Machine
 2016-05-06 13:45:29 -07:00
Nishant Totla
bc5217273a Merge pull request #2213 from allencloud/fix-typos-in-cluster 
fix typos in swarm/cluster.go
 2016-05-06 13:29:42 -07:00
Nishant Totla
5bbecbc13b Merge pull request #2212 from nishanttotla/update-release-checklist 
Updating Release checklist
 2016-05-06 13:25:31 -07:00
Joel Handwell
3d24e74e4c Krane project has been closed in favor of Machine 
Reference: https://github.com/krane-io/krane
Signed-off-by: Joel Handwell <joelhandwell@gmail.com>
 2016-05-06 10:00:45 -04:00
Sun Hongliang
a28e2e7e30 fix typos in swarm/cluster.go 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-06 11:16:37 +08:00
Nishant Totla
54863df074 Updating Release checklist 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-05 18:22:04 -07:00
Nishant Totla
372ad21097 Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1 
Bump version to 1.2.2-rc1
 2016-05-05 17:49:03 -07:00
Nishant Totla
777964583f Bump version to 1.2.2-rc1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-05-05 16:53:47 -07:00
Nishant Totla
502c00b150 Merge pull request #2210 from dongluochen/swarm_hang 
Do not allow double RLock() of RWMutex
 2016-05-05 16:37:50 -07:00
Dong Chen
d6e6703e29 Prevent double RLock() of RWMutex. It may lead to deadlock if there is Lock() call from another goroutine in between. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-05 10:45:34 -07:00
Dongluo Chen
5925814d84 Merge pull request #2180 from ogryzek/typo-edits 
Edit typos in 'Try Swarm at scale'
 2016-05-04 22:33:31 -07:00