e90d93d6e7
Merge pull request #1957 from mqliang/get-warm-typo
...
fix typo in get-swarm.md
2016-03-15 13:28:37 -07:00
c142e12e79
Merge pull request #1958 from mqliang/provision-typo
...
fix typo in provision-with-machine.md
2016-03-15 13:28:09 -07:00
81b6fded58
Merge pull request #1971 from vieux/rescheduling_out
...
move rescheduling out of experimental
2016-03-15 12:00:42 -07:00
b771a7cb14
Merge pull request #1973 from dongluochen/MaxThreadCount
...
Increase max thread count to 50k
2016-03-15 11:19:37 -07:00
66b78ef043
Merge pull request #1962 from allencloud/validate-refresh-time-interval-posotive
...
force to validate min and max refresh interval to be positive
2016-03-15 17:33:13 +08:00
408f3cff8e
Increase max thread count to 50k
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-14 18:36:48 -07:00
e24cc12814
Merge pull request #1796 from nishanttotla/list-conflicting-constraints
...
Print all constraints when container can't be scheduled
2016-03-14 18:24:15 -07:00
082f4b65af
move rescheduling out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 17:18:36 -07:00
5075e95612
Printing entire set of unsatisfiable constraints for container scheduling
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-14 17:17:06 -07:00
ac3a8b6ac9
Adding functions to list filter constraints of all types
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-14 17:17:06 -07:00
2ce00c6ce9
Merge pull request #1967 from allencloud/fix-typo-it's-to-its
...
fix typos
2016-03-14 13:37:04 -07:00
b9d0d8927f
force to validate min and max refresh interval to be positive
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-15 00:29:08 +08:00
42b1620f4d
Merge pull request #1966 from arunwizz/issue-1965
...
Fixed typo for word consul
2016-03-13 22:10:46 -07:00
172048942d
fix typos.
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-14 11:21:59 +08:00
a80ca0e51a
Merge pull request #1952 from mqliang/filter-typo
...
Filter typo in document
2016-03-13 12:02:41 -07:00
9a1133f7c7
Merge pull request #1959 from mqliang/intstall-w-typo
...
fix typo in install-w-machine.md
2016-03-13 12:01:55 -07:00
295c4da8d0
Fixed typo for word consul
...
Developer Certificate of Origin
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
660 York Street, Suite 102,
San Francisco, CA 94110 USA
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
Signed-off-by: Arun Y <arunwizz@gmail.com>
2016-03-13 19:58:29 +05:30
aa70529d3f
fix typo in install-w-machine.md
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 15:53:27 +08:00
97efac9d0c
fix typo in provision-with-machine.md
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 15:36:46 +08:00
e7ce927e9d
fix typo in get-swarm.md
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 15:20:38 +08:00
c1f5e17371
fix broken example list
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-13 10:52:22 +08:00
4b2f0fe637
Merge pull request #1953 from mqliang/multi-manager-typo
...
remove redundant word in docs
2016-03-12 15:04:19 -08:00
2d7c594270
remove redundant word in docs
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-12 19:03:33 +08:00
2803654488
fix typo in filter.md
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2016-03-12 18:50:12 +08:00
957f81036b
Merge pull request #1943 from nishanttotla/removing-dead-code
...
Deleting redundant code from volume.go
2016-03-11 13:44:48 -08:00
7f54d5e085
Merge pull request #1866 from gradywang/issue-1860
...
Support rescind offer in swarm.
2016-03-11 13:38:18 -08:00
63997816a5
Merge pull request #1945 from jimmyxian/add-support-ps-node-filter
...
Add support ps node filter
2016-03-11 13:09:49 -08:00
134df4293c
Support rescind offer in swarm.
...
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-03-11 11:13:56 +08:00
e7065eabf7
add support ps node filter
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-11 10:31:33 +08:00
8cbffa9492
Deleting redundant code from volume.go
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-10 14:14:28 -08:00
ba31ab2d4b
Merge pull request #1872 from echupriyanov/volume_info_fix
...
Fix get volume call for volumes with non-local drivers
2016-03-10 13:47:14 -08:00
8e35ac6c52
Merge pull request #1938 from nishanttotla/info-engine-api
...
Updating info function to use engine-api
2016-03-09 15:55:40 -08:00
6af37c4888
Updating info function to use engine-api
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-09 13:58:50 -08:00
9390d5f335
Merge pull request #1880 from nishanttotla/engine-api-trial
...
Introducing engine-api client into Swarm
2016-03-08 15:09:27 -08:00
453304c795
Updating version function to use engine-api
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 17:46:24 -08:00
7376fd156b
Updating Godeps (engine-api and go-connections)
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 15:05:43 -08:00
d4cfba1844
Adding engine-api client
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 15:05:43 -08:00
51f49d78f5
Merge pull request #1930 from dongluochen/ChannelDoubleClose
...
Prevent crash on double calls to Disconnect
2016-03-07 14:23:03 -08:00
e0583ea7d7
Prevent crash on channel double close.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-07 11:48:01 -08:00
1da3c25c06
Merge pull request #1927 from allencloud/fix-typos-in-test-and-annotation
...
fix typos in a test file and a function annotation
2016-03-04 10:03:38 -08:00
c34a45023f
fix typos in a test file and a function annotation
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-05 00:39:15 +08:00
313db93c08
Merge pull request #1925 from dongluochen/release-checklist-update
...
Update RELEASE-CHECKLIST.md
2016-03-03 18:22:22 -08:00
c8ad0d9dec
Update RELEASE-CHECKLIST.md.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-03 14:40:47 -08:00
efcc35ba08
Merge pull request #1924 from dongluochen/bump-1.1.3
...
Bump version to 1.1.3
2016-03-03 13:46:24 -08:00
bac853a417
Bump version to 1.1.3
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-03 13:37:22 -08:00
f7495b3801
Merge pull request #1923 from moxiegirl/fix-swarm-cap
...
Changing swarm to Swarm in body text
2016-03-03 10:19:21 -08:00
a348207f18
Merge pull request #1835 from jimmyxian/add-support-some-run-option
...
Add support some run options
2016-03-03 10:12:17 -08:00
4b8ed91226
Changing swarm to Swarm in body text
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-03 10:04:25 -08:00
ba4ad74de3
add support some run options
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-03-03 19:53:47 +08:00
ee28008f0b
Merge pull request #1881 from vieux/test_env_reschedule_compose
...
use env in compose test
2016-03-02 11:54:23 -08:00
Victor Vieux
Nishant Totla
Xian Chaobo
Dong Chen
Victor Vieux
Sun Hongliang
Arun Y
mqliang
Yongqiao Wang
moxiegirl
Alexandre Beslic