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

2097 Commits

Author SHA1 Message Date
Isabel Jimenez 305050025c making task timeout configurable 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-07-01 18:58:17 -04:00
Victor Vieux 2b4562482f Merge pull request #1014 from abronan/remove_consul_config 
Fix storage integration tests
 2015-07-01 15:39:53 -07:00
Victor Vieux 396f6d3466 Merge pull request #1011 from aluzzardi/upgrade-golang 
Upgrade golang version (1.3 -> 1.4).
 2015-07-01 15:39:11 -07:00
Andrea Luzzardi 12ba56e62e Merge pull request #1015 from vieux/skip_attach_websocket 
skip test: docker attach through websocket
 2015-07-01 15:38:12 -07:00
Victor Vieux f80556ce9c Merge pull request #1012 from vieux/disable_mesos_tests 
disable mesos tests because mesos is incompatible with the next version of docker
 2015-07-01 15:36:40 -07:00
Victor Vieux 311af01992 Merge pull request #968 from aluzzardi/bump-0.4.0 
Bump version to 0.4.0
 2015-07-01 15:11:29 -07:00
Mary Anthony 45257e0548 Updating wieght 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-30 18:03:02 -07:00
Mary Anthony 9dfa2ab0ce fixing weight 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-30 17:51:22 -07:00
Alexandre Beslic b0fe6000b7 revert to using s.heartbeat for store failover 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-30 17:38:51 -07:00
Victor Vieux 8ad04fab7a skip test: docker attach through websocket 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 17:25:16 -07:00
Mary Anthony 3f0cdc5de9 Changing title on menu 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-30 17:25:10 -07:00
Victor Vieux c3eaa00547 disable mesos tests because mesos is incompatible with the next version of docker 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 16:53:09 -07:00
Mary Anthony f908f1eeb1 Switch to install 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-30 16:44:17 -07:00
Andrea Luzzardi 2c35a860f7 Upgrade golang version (1.3 -> 1.4). 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-06-30 16:34:03 -07:00
Andrea Luzzardi 3243b093aa Merge pull request #1009 from vieux/fix_api_version 
fix api/version.bats
 2015-06-30 16:26:38 -07:00
Andrea Luzzardi 77849bd45a Merge pull request #1010 from vieux/remove_2_warnings 
remove 2 warnings in docker info
 2015-06-30 16:26:24 -07:00
Victor Vieux ca93c2a21a fix api/version.bats 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 15:25:40 -07:00
Victor Vieux 126eade4b9 remove 2 warnings in docker info 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 15:20:44 -07:00
Andrea Luzzardi bedf1ec3ff Merge pull request #1008 from abronan/update_libkv_godeps 
Update libkv godeps and minor fixes
 2015-06-30 15:19:44 -07:00
Alexandre Beslic 56e4dbb480 use const for failover watch time and minor comment fix in tests 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-30 14:04:41 -07:00
Alexandre Beslic 03a7be2919 fix issue with zookeeper and occasional SOH character return 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-30 14:04:05 -07:00
Alexandre Beslic d766fea7a8 Merge pull request #1004 from vieux/fix_api_test 
fix api_version test
 2015-06-30 11:59:05 -07:00
Alexandre Beslic 961e46d068 update Godeps: libkv 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-30 11:55:43 -07:00
Victor Vieux 00e4e1c573 fix api_version test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-30 11:48:08 -07:00
moxiegirl 3f7715c030 Merge pull request #959 from ahmetalpbalkan/patch-2 
Container name fix scheduler/filter/README.md
 2015-06-30 08:03:32 -07:00
Andrea Luzzardi c1312835ea Merge pull request #993 from ealang/master 
606- Prevent panic if a container is removed during a refresh
 2015-06-29 20:14:02 -07:00
Andrea Luzzardi a24cb1ee95 Merge pull request #924 from abronan/libkv_migration 
Migration from pkg/store to docker/libkv
 2015-06-29 20:08:07 -07:00
ealang 15fc8d8210 Prevent panic if a container is removed during a refresh 
If InspectContainer fails, Engine.containers gets set to nil.

Log cause of updateContainer failure.

Signed-off-by: Eric Lang <ealang@gmail.com>
 2015-06-29 22:04:15 -05:00
Alexandre Beslic 4fa9dbbfe0 lower ttl min for consul in integration tests 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-29 16:19:21 -07:00
Alexandre Beslic f50cd10061 migrate from pkg/store to docker/libkv 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-29 16:19:21 -07:00
Alexandre Beslic 04d55f3951 remove pkg/store 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-29 16:19:21 -07:00
Alexandre Beslic c70f6f8afe update godeps to include libkv 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-29 16:19:21 -07:00
moxiegirl 7d2e4c5787 Merge pull request #994 from moxiegirl/rnote-fix 
Rnote fix
 2015-06-26 03:13:08 -07:00
Mary Anthony 1ed28a1105 Fixing releasnotes 
Removing older release notes. No longer supporting cumulative

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-26 03:01:40 -07:00
moxiegirl 03ea9b2b4f Merge pull request #986 from moxiegirl/1.7-release-notes 
Comment out the old release notes
 2015-06-21 20:42:54 -07:00
Mary Anthony b2ddf537a3 Comment out the old releas notes 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-21 16:49:45 -07:00
moxiegirl bcdaae5860 Merge pull request #979 from moxiegirl/fix-headers-for-release 
Fixing the headers
 2015-06-19 15:00:29 -07:00
Mary Anthony e765a82b67 Fixing the headers 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-19 14:59:16 -07:00
moxiegirl 092a5a3457 Merge pull request #940 from abronan/leader_election_doc 
Add documentation on Leader Election/High Availability for `swarm manage`
 2015-06-19 11:32:39 -07:00
Alexandre Beslic ee95c53de6 add documentation on leader election/high availability of swarm manager instances 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-06-18 15:52:30 -07:00
Andrea Luzzardi d0a457f209 Merge pull request #976 from moxiegirl/hugo-test-fixes 
Hugo final 1.7 Documentation PR -- please read carefully
 2015-06-18 12:23:51 -07:00
Mary Anthony 686caf1185 Fixing duplicate title 
Closes #948 the fix that Amy put in
Updating sed scripts
Updating after link tests

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-18 12:12:48 -07:00
Andrea Luzzardi a439471fe6 Bump version to 0.4.0 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-06-16 15:10:27 -07:00
Andrea Luzzardi 28cd51b65f Merge pull request #958 from vieux/update_usage2 
update usage
 2015-06-16 12:33:12 -07:00
Andrea Luzzardi eb14552907 Merge pull request #965 from jimenez/totalmemory-totalcpus 
adding implementation for TotalMemory and TotalCpus
 2015-06-16 12:32:26 -07:00
Victor Vieux 077489a948 Merge pull request #960 from ahmetalpbalkan/random 
scheduler/random: Use private instance of rand
 2015-06-15 18:13:20 -07:00
Isabel Jimenez d86ab642fb adding implementation for TotalMemory and TotalCpus 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-06-15 21:05:27 -04:00
Xian Chaobo 05ba86d329 golint and add integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 08:46:17 +08:00
Xian Chaobo 8cd667e996 add unit test for AddSoftImageAffinity 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 07:52:53 +08:00
Xian Chaobo 8c7c0b248b reschedule with soft image affinity 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 07:52:00 +08:00