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
1,963 Commits 57 Branches 28 Tags
d1291203a671073ae1ceb6d2a6e4b709883ee82b
Commit Graph

1963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chanwit Kaewkasi
d1291203a6 Merge pull request #1128 from vieux/add_chanwit 
add Chanwit to the MAINTAINERS file
 2015-08-07 20:31:05 -04:00
Victor Vieux
4ff1615710 Merge pull request #1134 from vlajos/typofixes-vlajos-20150807 
typofix - https://github.com/vlajos/misspell_fixer
 2015-08-07 16:31:21 -07:00
Veres Lajos
0d94d7a11a typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:06:16 +01:00
Xian Chaobo
019c809cb0 Merge pull request #1132 from aluzzardi/jimmyxian-maintainer 
Add @jimmyxian as a maintainer
 2015-08-08 05:16:12 +08:00
Andrea Luzzardi
c9ee66e823 Add @jimmyxian as a maintainer 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-08-07 12:59:26 -07:00
moxiegirl
d647d820b7 Merge pull request #1120 from JamesYongQiaoWang/enhanceReadMe 
Enhance the README to install swarm from source
 2015-08-07 06:26:30 -07:00
Victor Vieux
d247e8e034 add Chanwit to the MAINTAINERS file 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-08-06 10:45:58 -07:00
Victor Vieux
bf4bb808e7 Merge pull request #1119 from JamesYongQiaoWang/fixSpellError 
Fix the spell error.
 2015-08-05 10:46:22 -07:00
Victor Vieux
fabc7d732d Merge pull request #1118 from jimmyxian/fix-load-api 
fix load api
 2015-08-05 10:45:53 -07:00
James Wang Yong Qiao
ef123b3fcd Enhance the README to install swarm from source 
The current steps to install swarm from source
does not work on Ubuntu 14.04, especially for a
swarm newer, it needs to spend plenty to time to
address this issue (unknown http.Client field 'Timeout'
in struct literal). Suggest to enhance those steps to make them can be followed easily.

Signed-off-by: James Wang Yong Qiao <jamesyongqiao@gmail.com>
 2015-08-05 03:28:44 -04:00
Xian Chaobo
fdcb59b4ec fix load api 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-05 02:44:54 -04:00
James Wang Yong Qiao
88bbdff2e0 Fix the spell error. 
Signed-off-by: James Wang Yong Qiao <jamesyongqiao@gmail.com>
 2015-08-05 02:44:31 -04:00
Andrea Luzzardi
4cee3ad3b4 Merge pull request #1117 from abronan/fix_consul_multiple_ips 
update libkv godeps, fixes consul multiple IPs silently discarded
 2015-08-04 23:32:54 -07:00
Andrea Luzzardi
3bb4373f9f Merge pull request #1111 from vieux/no_json_manual 
do not generate JSON by hand
 2015-08-04 15:30:30 -07:00
Victor Vieux
46962397a2 Merge pull request #1116 from aluzzardi/align-process 
Update docs to align process with Engine.
 2015-08-04 12:01:24 -07:00
Andrea Luzzardi
add72eb06a Merge pull request #1078 from abronan/leader_election_retry 
Leadership: Fault tolerant Leader Election mechanism
 2015-08-04 11:52:56 -07:00
Andrea Luzzardi
cabd1208fa Update docs to align process with Engine. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-08-04 11:49:47 -07:00
Victor Vieux
2606db4486 Merge pull request #1085 from jimmyxian/improve-build 
Improve build
 2015-08-04 11:44:17 -07:00
Alexandre Beslic
40bad153e7 update libkv godeps, fixes consul multiple IPs silently discarded 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-08-04 10:53:09 -07:00
Xian Chaobo
a3cf5b9e9c improve build 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-04 02:45:06 -04:00
Andrea Luzzardi
60dc3099f4 Merge pull request #1082 from polyverse-security/mborsa_create_container_nil_pointer 
Avoid nil pointer dereference in (*Cluster).createContainer
 2015-07-31 16:44:46 -07:00
mariusz
2605d398b6 Updated the identifier as requested by @aluzzardi 
Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
Tickle Jenkins
 2015-07-31 16:32:12 -07:00
Alexandre Beslic
30f3a32989 Merge pull request #1112 from vieux/fix_stats 
fix stats test
 2015-07-31 13:00:58 -07:00
mariusz
e1daa7c47b Error from Engine when refresh doesn't pickup new container 
Fix for https://github.com/docker/swarm/issues/1081
    Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
 2015-07-31 11:21:24 -07:00
mariusz
9dc65ca480 Avoid nil pointer dereference in (*Cluster).createContainer 
Swarm.Create car return nil,nil when refresh fails
due to network hiccup

Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
 2015-07-31 11:21:24 -07:00
Alexandre Beslic
c7513506be Fault tolerant Leader Election process, fixes leader information on docker info, fixes intermittent error on Consul session lock 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-07-31 10:06:47 -07:00
Victor Vieux
d594680e4f fix stats test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 21:22:44 -07:00
Victor Vieux
7ec33a81b5 do not generate JSON by hand 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 18:10:13 -07:00
Andrea Luzzardi
95c4c9467e Merge pull request #1109 from vieux/switch_to_overlay 
fix CI
 2015-07-30 15:16:10 -07:00
Victor Vieux
69d2f40ded Merge pull request #1103 from aluzzardi/maintainers-file 
Add MAINTAINERS file.
 2015-07-30 14:46:16 -07:00
Victor Vieux
b8f50bbf1f disable mesos tests again 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 14:09:18 -07:00
Andrea Luzzardi
99b94a1c91 Add MAINTAINERS file. 
Fixes #484

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-29 18:16:47 -07:00
Alexandre Beslic
5f207e6fe9 Merge pull request #1101 from alexwlchan/master 
Fix a pair of typos in the docs
 2015-07-29 10:57:20 -07:00
Victor Vieux
c5e3b56653 Merge pull request #1102 from FreedomWangLi/master 
Spelling mistakes
 2015-07-29 10:51:06 -07:00
FreedomWangLi
102d8cbe58 Spelling mistakes 
There is a spelling mistake in the leadship pachage,
fix it in this patch.

Signed-off-by: Yong Qiao Wang <yqwyq@cn.ibm.com>
 2015-07-29 10:12:33 -04:00
Alex Chan
a27c2e2d43 Fix a pair of typos in the docs 
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
 2015-07-29 13:53:13 +01:00
Victor Vieux
97f55ad610 Merge pull request #1098 from aluzzardi/leadership-integration 
Leadership: integration tests
 2015-07-28 23:37:48 -07:00
Andrea Luzzardi
cafca42239 Integration test for leader election 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-28 18:26:52 -07:00
Andrea Luzzardi
22dcdc245d integration helpers: Allow to run multiple managers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-28 18:26:17 -07:00
moxiegirl
2a9503e449 Merge pull request #1073 from moxiegirl/remove-boot2docker-1072 
Fixes #1072 replacing boot2docker references
 2015-07-27 18:39:47 -07:00
Andrea Luzzardi
c82a953422 Merge pull request #1080 from vieux/add_changelog 
add CHANGELOG.md
 2015-07-21 17:54:32 -07:00
Victor Vieux
67cd9259eb Merge pull request #1071 from peggyl/fix-typos 
Fix scheduler typos and broken links
 2015-07-21 11:01:34 -07:00
Peggy Li
0572a6778c Fix 'Scheduler' typos and update User Guide link 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-07-20 20:41:33 -07:00
moxiegirl
b2182d0809 Merge pull request #1074 from moxiegirl/update-docs-dockerfile 
Updating to use the new base
 2015-07-20 06:16:05 -07:00
Mary Anthony
d6e433da2c Updating to use the new base 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-19 15:42:05 -07:00
Victor Vieux
5a217d6169 add new endpoints for docker cp 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 22:04:56 -07:00
Victor Vieux
bcc28f658d disable docker attach websocket test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 21:48:05 -07:00
Victor Vieux
fe4163148f fix docker wait test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 21:47:41 -07:00
Victor Vieux
05234232a3 switch tests to overlay 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 21:01:11 -07:00
Mary Anthony
eb78d72ef0 Fixes #1072 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 16:45:57 -07:00