Commit Graph

1918 Commits

Author SHA1 Message Date
Xian Chaobo acdb67bd63 godeps update
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-07-08 18:03:18 +08: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 20c3a7810c Merge pull request #1035 from moxiegirl/fix-list
Fixes 1021 by reformatting the list
2015-07-17 11:05:42 -07:00
moxiegirl 8d8945061f Merge pull request #1068 from peggyl/update-github-links
Update Github links to point to docker/swarm
2015-07-17 10:50:02 -07:00
Mary Anthony 99fb28f7d3 Fixes 1021 by reformatting the list
Changing front to frontend per vieux
Updating to get lists looking proper

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:47:10 -07:00
Peggy Li 2628b5510a Update Github links to point to docker/swarm
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-07-16 19:03:26 -07:00
Alexandre Beslic 729001c9b4 Merge pull request #1066 from vieux/n_engine
rename n to e
2015-07-16 11:57:27 -07:00
Victor Vieux 39309f7a62 rename n to e
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-16 11:55:33 -07:00
Victor Vieux 48115bce68 Merge pull request #1065 from vieux/random_port
support docker run -p <port> in mesos (random)
2015-07-16 11:45:17 -07:00
Victor Vieux 542620d60d support docker run -p <port> in mesos (random)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-16 11:24:45 -07:00
Victor Vieux 1d8d00a55e add changelog
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-16 11:06:39 -07:00
Victor Vieux bfd3fdfa4c Merge pull request #1063 from peggyl/scheduler-strategy-godoc
Add more meaningful godoc comments for the scheduler/strategy package
2015-07-16 09:06:26 -07:00
Peggy Li 5d1ae7b674 Add more meaningful godoc comments for the scheduler/strategy package
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-07-16 02:06:04 -07:00
Alexandre Beslic 1ab4129df6 Merge pull request #1048 from aluzzardi/leader-prefix
Leader Election: Use same path prefix as discovery.
2015-07-15 21:14:00 -07:00
Alexandre Beslic 02ba1fad43 Merge pull request #1032 from vieux/fix_match_push
fix image matching in push
2015-07-14 17:02:01 -07:00
Victor Vieux 2037540728 Merge pull request #1059 from vieux/add_env_support_in_mesos
add env support in mesos
2015-07-14 15:43:17 -07:00
Victor Vieux 248370469f add hostname support
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-14 15:25:38 -07:00
Victor Vieux b3385caa4e add env support in mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-14 14:47:47 -07:00
Victor Vieux ef2d11899a Merge pull request #1058 from vieux/add_events
add events to mesos and a few tests
2015-07-14 14:40:24 -07:00
Victor Vieux f00e6aa967 add events to mesos and a few tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-14 14:20:17 -07:00
Victor Vieux 8e999214fb Merge pull request #1052 from gonkulator/master
Grammar regarding least and fewest
2015-07-14 11:49:24 -07:00
Victor Vieux 8935c892c3 Merge pull request #1054 from tombenner/fix_typo
Fix small typo ("an"/"ran") in installation docs
2015-07-14 11:48:59 -07:00
Victor Vieux 113601341a Merge pull request #1056 from rmg/preserve-exec-status
preserve status code from POST /containers/*/exec
2015-07-14 10:51:19 -07:00
Alexandre Beslic 1a5881ec49 Merge pull request #971 from jimmyxian/reschedule-with-image
Reschedule with soft image affinity
2015-07-13 09:11:18 -07:00
Ryan Graham 9bd9fee7d6 preserve status code from POST /containers/*/exec
The docker remote API specifies that a 201 is returned on successful
creation of an Exec and a strict client will not accept that being
turned into a 200.

https://docs.docker.com/reference/api/docker_remote_api_v1.19/#exec-create

Resolves #1055

Signed-off-by: Ryan Graham <r.m.graham@gmail.com>
2015-07-12 15:31:59 -07:00
Tom Benner 08a77c19c8 Fix small typo ("an"/"ran")
Signed-off-by: Tom Benner <tombenner@gmail.com>
2015-07-11 00:09:05 -07:00
Victor Vieux 6ecab7f5b7 Merge pull request #942 from vieux/use_port_docker_offer
Allow multiple docker engines/mesos slaves in the mesos tests
2015-07-10 15:33:26 -07:00
Victor Vieux d13c3b0ff9 Merge pull request #1053 from vieux/add_mesos_tests_back
add mesos tests back
2015-07-10 14:42:21 -07:00
moxiegirl dc8ed32402 Merge pull request #1050 from elgalu/patch-1
Fix tiny typo "is is" with "is" in index.md
2015-07-10 13:57:11 -07:00
fl0yd b0cbaeccae Grammar regarding least and fewest
Signed-off-by: Mark Oates fl0yd@me.com
Signed-off-by: Mark Oates <fl0yd@me.com>
2015-07-10 15:33:22 -05:00
Victor Vieux d86cdc6ef5 Merge pull request #1051 from jimmyxian/fix-pull-image
fix #927 check pull status code
2015-07-10 10:44:11 -07:00
Leo Gallucci 014fa26875 Fix tiny typo "is is" with "is" in index.md
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
2015-07-10 09:59:38 +02:00
Victor Vieux 463b058b6d Merge pull request #1049 from vieux/update_mesos-go
update mesos-go
2015-07-09 16:07:43 -07:00
Victor Vieux 28c62b1fcf Merge pull request #1017 from vieux/hostname_mesos
override hostname in mesos
2015-07-09 14:14:55 -07:00
Andrea Luzzardi f38c034499 Leader Election: Use same path prefix as discovery.
Fixes #1037

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-07-09 01:16:47 -07:00
Victor Vieux 0d7dd1ad6f don't use PORTS
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-07 14:18:37 -07:00
Victor Vieux 82d3d64b7e update a test to use 2 slaves
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-07 13:37:33 -07:00
Victor Vieux 5a39d21707 use random port in mesos tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-07 13:37:33 -07:00
Victor Vieux 49d475228e use docker_port from offer is present
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-07 13:37:33 -07:00
Victor Vieux b18b5bf9f7 add mesos tests back
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-07 13:27:40 -07:00
Victor Vieux 7e4a457a9a Merge pull request #1036 from Pensu/fix-simple-spelling
Fixing spelling of again
2015-07-07 11:48:51 -07:00
Victor Vieux d7c11fab16 update mesos-go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-07-07 08:35:47 -07:00
Xian Chaobo 402053fa00 fix #927 check pull status code
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-07-07 17:41:12 +08:00
Peeyush Gupta fa0cc6d1df Fixing spelling of again
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
2015-07-07 11:09:39 +05:30
Xian Chaobo 0037c31a95 fix func name and use extracExprs
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-07-07 11:30:26 +08:00
Alexandre Beslic 151bb84316 Merge pull request #1034 from vieux/return_systemtime
/info now returns SystemTime
2015-07-06 19:34:34 -06:00