centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 14:25:46 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,993 Commits 57 Branches 28 Tags
fc0cc899e66d2113fc67c366c59832eb577d7c0c
Commit Graph

1993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Beslic
fc0cc899e6 Merge pull request #1162 from jimmyxian/add-support-force-remove-image 
Add support force remove image
 2015-08-19 20:41:58 -07:00
Xian Chaobo
12e956e681 add support force remove images 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-19 23:09:02 -04:00
Xian Chaobo
f5ac0c87e3 update godeps 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-19 22:02:59 -04:00
Andrea Luzzardi
7534988b6a Merge pull request #1154 from chanwit/ver-050-dev 
bump version to 0.5.0-dev
 2015-08-19 13:48:19 -07:00
Chanwit Kaewkasi
2fd733b11e bump version to 0.5.0-dev 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-08-16 11:01:49 -04:00
Xian Chaobo
98178f3c41 Merge pull request #1152 from vieux/enable_better_refresh_mesos_0.23 
enable better refresh with mesos 0.23
 2015-08-15 15:50:41 +08:00
Chanwit Kaewkasi
918c7a0466 Merge pull request #1148 from vieux/add_container_mesos 
add container name in mesos task label and update mesos-go
 2015-08-14 20:53:35 -04:00
Victor Vieux
58482a13d2 enable better refresh with mesos 0.23 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-14 17:11:19 -07:00
Victor Vieux
cc7b9b2176 add container name in mesos task label 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-14 13:48:49 -07:00
moxiegirl
a80cb7ba34 Merge pull request #1144 from moxiegirl/final-link-check 
Fixing links after check
 2015-08-13 07:53:17 -07:00
Alexandre Beslic
83f93dff47 Merge pull request #1146 from jimmyxian/improve-image-all 
Add support images -a
 2015-08-12 11:17:52 -07:00
Xian Chaobo
d4daee4f27 add support images -a 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-12 07:39:11 -04:00
Chanwit Kaewkasi
d82186e4de Merge pull request #1145 from vieux/better_bats_display 
udpate bats display in janky
 2015-08-11 14:47:19 -04:00
Victor Vieux
6c8578bda5 udpate bats display in janky 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-08-11 11:43:01 -07:00
Andrea Luzzardi
11b12b81b0 Merge pull request #1141 from vieux/only_display_swarm_containers 
display only containers created by swarm in mesos
 2015-08-11 11:37:36 -07:00
Mary Anthony
55692c3ec0 Fixing links after check 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-11 09:56:33 -07:00
Victor Vieux
d5c41a38c1 update tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-10 23:09:52 -07:00
Victor Vieux
2a70ff3e1f display only containers created by swarm in mesos 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-10 22:51:39 -07:00
Andrea Luzzardi
d580bf9b7b Merge pull request #1133 from vieux/use_0.23_mesos 
use mesos 0.23 in tests
 2015-08-10 15:28:08 -07:00
Victor Vieux
6f52d113a4 remove useless swarm_manage_mesos function 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-10 14:21:49 -07:00
Victor Vieux
2b3759cd21 Merge pull request #1139 from vieux/remove_old_release_notes 
remove useless release-notes.md
 2015-08-10 13:35:44 -07:00
Victor Vieux
2537f4abf9 remove useless release-notes.md 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-08-10 13:32:57 -07:00
Victor Vieux
32320e4249 use mesos 0.23 in tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-07 18:45:06 -07:00
Chanwit Kaewkasi
10171228e2 Merge pull request #1124 from vieux/improve_usage 
improve usage for discovery
 2015-08-07 20:57:33 -04:00
Andrea Luzzardi
c2efaadbea Merge pull request #1123 from vieux/add_before_support 
add support for --before in ps
 2015-08-07 17:38:42 -07:00
Andrea Luzzardi
b32f0da81d Merge pull request #1127 from chanwit/natural-sort 
Natural sorting for Engine names
 2015-08-07 17:36:08 -07:00
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
Chanwit Kaewkasi
974a482d16 implemented naturalsorter for engine 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-08-06 11:35:49 -04:00
Chanwit Kaewkasi
aae6fba936 add naturalsort dependency 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-08-06 10:45:57 -04: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
Victor Vieux
28bc55ed6b improve usage for discovery 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-01 16:53:07 -07:00
Victor Vieux
31932311a1 add support for --before in ps 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-01 16:41:48 -07:00