1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

3113 Commits

Author SHA1 Message Date
Allen Sun
14cb2e0805 Merge pull request #2369 from LukasBacigal/master
[DOC] Typo in scheduler/filter.md #2
2016-06-22 07:06:24 +08:00
Lukáš Bacigál
1ba800ddbf Typo in scheduler/filter.md
Correcting link to header.

Signed-off-by: Lukáš Bacigál <pixel6692@gmail.com>
2016-06-22 00:14:08 +02:00
Charles Smith
cb7a723884 Merge pull request #2361 from sfsmithcha/engine_112_overview
author merge: add note to Swarm docs to refer to swarm mode in Engine
2016-06-20 16:33:52 -07:00
Xian Chaobo
a34785e489 Merge pull request #2303 from xianlubird/bug/concurrent_network
Fix network Uniq method concurrent map writes problem
2016-06-20 19:03:58 +08:00
Allen Sun
4180caed47 Merge pull request #2357 from axhm3a/master
fixed backticks typo in configure-tls.md
2016-06-19 07:08:22 +08:00
Charles Smith
af7d223f68 add note to Swarm docs to refer to swarm mode in Engine
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-17 16:37:16 -07:00
Allen Sun
79f086dbff Merge pull request #2358 from NanXiao/issue-9998
Fix typo in cluster/swarm/cluster.go
2016-06-18 04:54:58 +08:00
NanXiao
a897e53dcc Fix typo in cluster/swarm/cluster.go
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-17 19:40:55 +08:00
Daniel Basten
7df94645f0 fixed backticks typo in configure-tls.md
Signed-off-by: Daniel Basten <daniel.basten@comlineag.de>
2016-06-17 08:18:44 +02:00
Doron Podoleanu
6d5638b95b Create in engine.go renamed to CreateContainer (#2283)
* Create in engine.go renamed to CreateContainer

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-06-15 16:56:03 -07:00
Nishant Totla
d8e7932be4 Merge pull request #2350 from nishanttotla/bump-v1.2.4-rc1
Bump version to 1.2.4-rc1
2016-06-14 16:55:42 -07:00
Nishant Totla
fa4325ad6f Bump version to 1.2.4-rc1
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-14 16:49:45 -07:00
Alexandre Beslic
a84967a1a8 Merge pull request #2314 from thaJeztah/update-docs-maintainers
Update docs maintainers
2016-06-14 14:44:10 -07:00
Dongluo Chen
b3205ca161 Merge pull request #2288 from nishanttotla/refactoring-img-handling
Refactoring code around image ref generation
2016-06-14 14:34:20 -07:00
Nishant Totla
1675c4ca85 Merge pull request #2271 from abronan/fix_leader_election_test
integration: increase retry for leader election store failure test
2016-06-14 14:17:30 -07:00
Allen Sun
0121b63c22 Merge pull request #2347 from NanXiao/issue-9998
Edited cluster/cluster.go
2016-06-14 13:13:16 +08:00
NanXiao
5f0e652d29 Edited cluster/cluster.go
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-13 17:47:09 +08:00
Allen Sun
79ee15fbb2 Merge pull request #2338 from NanXiao/issue-9999
Edited docs/discovery.md
2016-06-08 15:11:56 +08:00
NanXiao
a1c58f5149 Fix typos in docs/reference/manage.md and docs/reference/join.md
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-08 17:02:07 +08:00
Xian Chaobo
453d71753e Merge pull request #2144 from allencloud/show-container-status-of-node-in-docker-info
show container status of each node in docker info
2016-06-06 10:32:27 -05:00
Nishant Totla
f7c2deda47 Merge pull request #2326 from tomwillfixit/install_manual_typo
Typo in install manual
2016-06-04 18:16:13 -07:00
tommyoshaw
0ef545fde6 Typo in install manual
Signed-off-by: tommyoshaw <thomas.shaw78@gmail.com>
2016-06-04 18:54:59 +01:00
Allen Sun
d9abab6ca9 Merge pull request #2261 from allencloud/remove-engine-in-volume-create-response
remove engine details in POST /volumes/create API
2016-06-04 11:48:14 +08:00
Sven Dowideit
de6f09e5b7 Merge pull request #2321 from SvenDowideit/aliases-need-to-be-absolute
hugo aliases need to be absolute
2016-06-03 13:28:04 -07:00
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
Sebastiaan van Stijn
63997947bc Update docs maintainers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-01 01:04:21 +02: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
xianlubird
c4886bd006 Fix network uniq method concurrent map writes problem
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-05-31 11:10:45 +08:00
allencloud
d7241f3682 remove engine details in POST /volumes/create API
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-29 15:12:14 +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
e782541d99 Refactoring code around image ref generation
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-26 10:37:39 -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