Victor Vieux
7c1dcadb98
Merge pull request #2065 from dongluochen/UpdateEngineApi
...
Update engine-api
2016-03-31 11:02:33 -07:00
Dong Chen
b50529ccce
Update engine-api.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-31 09:52:19 -07:00
Alexandre Beslic
248cc597c0
Merge pull request #2053 from allencloud/make-port-0-in-checkAddrFormat-invalid
...
make port 0 invalid in checkAddrFormat
2016-03-30 14:09:03 -07:00
Dongluo Chen
d8bd5f9a53
Merge pull request #2056 from nishanttotla/image-list-engine-api
...
Moving Image handling to engine-api
2016-03-30 12:11:51 -07:00
Nishant Totla
8a003a5fa8
Reusing ImageListOptions for ImageFilterOptions
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 11:00:05 -07:00
Nishant Totla
ebdbefecda
Updating image related unit tests to use engine-api
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 10:15:35 -07:00
Nishant Totla
7de9f6ee62
Moving over images to use engine-api
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 09:46:38 -07:00
Sun Hongliang
e60b93aef3
make port 0 invalid in checkAddrFormat
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-30 19:47:42 +08:00
Dongluo Chen
d2bbd6bc19
Merge pull request #2038 from allencloud/make-2xx-response-status-codes-compatile-with-docker
...
make 2xx response status code compatible with docker engine
2016-03-29 23:06:55 -07:00
Sun Hongliang
7402cf6354
make 2xx response status code compatible with docker
...
1. POST /images/load from 201 to 200
2. POST /images/{name:.*}/tag from 200 to 201
3. POST /containers/{name:.*}/rename from 200 to 204
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-30 08:50:18 +08:00
Nishant Totla
2e9daede48
Merge pull request #1982 from MHBauer/apiClient-rmi
...
use apiClient for various things
2016-03-29 16:11:01 -07:00
Morgan Bauer
4516d1ae16
use apiClient for volumes management
...
- create volume
- list volumes
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 15:01:27 -07:00
Morgan Bauer
0be5b31f27
use apiClient for listing networks in refresh
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer
08a475d661
use apiClient for removing volumes
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer
cac3943680
use apiClient for removing networks
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer
1e22226b71
use apiClient for removing images
...
- remove unused argument
- unit test of new client
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Victor Vieux
0b50dbd503
Merge pull request #2048 from dongluochen/FixContainerStateString
...
Godep update dockerclient
2016-03-29 14:08:40 -07:00
Dong Chen
ea5f2e0f63
Godep update dockerclient
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-29 12:01:56 -07:00
Victor Vieux
3461df4032
Merge pull request #2042 from vieux/update_build
...
support private images, labels and other new flags in docker build
2016-03-28 22:50:28 -07:00
Dongluo Chen
082d197ea6
Merge pull request #2043 from nishanttotla/print-version-in-info
...
Printing engine version in Info
2016-03-28 19:05:13 -07:00
Nishant Totla
0ebb26bdd4
Printing engine version in Info
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-28 17:40:50 -07:00
Dongluo Chen
c567e4e675
Merge pull request #1987 from allencloud/log-error-when-getting-swarm-kernel-and-os-info
...
handle error when getting kernel and os info error
2016-03-28 15:44:43 -07:00
Victor Vieux
d848e92b93
Merge pull request #2041 from vieux/update_dockerclient
...
update dockerclient to get labels on volumes, networks, etc...
2016-03-28 15:27:29 -07:00
Nishant Totla
b5bc256046
Merge pull request #2037 from CodeJuan/master
...
typo, the port of consul is 8500
2016-03-27 22:08:13 -07:00
CodeJuan
ae46892a29
typo, the port of consul is 8500
...
Signed-off-by: codejuan <xh@decbug.com>
2016-03-28 12:53:05 +08:00
Nishant Totla
4db4e951c7
Merge pull request #2031 from allencloud/fix-minor-typo
...
fix minor typo
2016-03-27 18:36:32 -07:00
Nishant Totla
a3b84856e8
Merge pull request #2035 from allencloud/fix-typo-in-changelog
...
fix typo in changelog.md
2016-03-27 18:35:15 -07:00
Xian Chaobo
78f239ba1e
Merge pull request #2028 from allencloud/log-err-when-starting-rescheduled-container-fails
...
output error when starting a rescheduled container fails
2016-03-28 09:30:13 +08:00
Sun Hongliang
8751437324
fix typo in changelog.md
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-26 22:17:07 +08:00
Sun Hongliang
da7128cc16
fix minor typo
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-26 10:33:11 +08:00
Victor Vieux
a5cba297ed
Merge pull request #2025 from vieux/watchdog_primary
...
enable rescheduling watchdog only when primary
2016-03-25 14:46:38 -07:00
Nishant Totla
195b55d06c
Merge pull request #2016 from dongluochen/Dockerbug14203
...
Skip unstable tests from Docker bug 14203
2016-03-25 11:14:53 -07:00
Morgan Bauer
3990430ab1
Merge pull request #2013 from allencloud/add-read-lock-only-when-necessary
...
add read lock for eventsHandler when only it is necessary.
2016-03-25 10:32:38 -07:00
Sun Hongliang
ec0c3f7bbd
output error when starting a rescheduled container fails.
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-25 19:28:46 +08:00
Victor Vieux
e98cf00409
support private images, labels and other new flags in docker build
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 18:27:20 -07:00
Sun Hongliang
c04cae5bf0
add read lock for eventsHandler when only it is necessary.
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-25 08:58:45 +08:00
Victor Vieux
5e8bad38f6
update godeps
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 16:36:23 -07:00
Victor Vieux
b963ffca3e
improve volume inspect test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 13:41:38 -07:00
Nishant Totla
510ea94890
Merge pull request #2022 from pietervisser/patch-1
...
Fixes typo in docs 03-create-cluster.md
2016-03-24 13:34:36 -07:00
Victor Vieux
e5dbf29484
update dockerclient to get labels on volumes, networks, etc...
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 13:09:36 -07:00
Dongluo Chen
69c44967be
Merge pull request #2017 from allencloud/fix-typos-in-mesos
...
fix typos in /swarm/cluster/mesos/cluster.go
2016-03-24 10:12:11 -07:00
Pieter
f208be4b95
Fixes typos in docs 'Swarm at scale'
...
Minor typos
Signed-off-by: Pieter Visser <pieter@pietervisser.nl>
2016-03-24 17:55:47 +01:00
Victor Vieux
ffba4054dc
enable rescheduling watchdog only when primary
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 06:34:05 -07:00
Xian Chaobo
dcf2608798
Merge pull request #1992 from dongluochen/AddNodeSpecUpdate
...
Periodically update node spec
2016-03-24 20:36:32 +08:00
Sun Hongliang
3843dbb381
fix typos in /swarm/cluster/mesos/cluster.go
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-24 10:49:28 +08:00
Dong Chen
96980d954d
Skip unstable tests from Docker bug 14203.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-23 18:30:21 -07:00
Nishant Totla
ef1c777887
Merge pull request #2010 from dongluochen/ReleaseDocUpdate
...
small updates to RELEASE-CHECKLIST.md
2016-03-22 17:26:24 -07:00
Dong Chen
5f08cabef6
update RELEASE-CHECKLIST.md
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 17:14:19 -07:00
Dongluo Chen
027b34a2bc
Merge pull request #2009 from dongluochen/bump-1.2.0-rc1
...
Bump version to 1.2.0-rc1
2016-03-22 16:18:51 -07:00
Dong Chen
27cf675aba
Bump version to 1.2.0-rc1
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 16:14:53 -07:00