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
f9f12ef2dc
Merge pull request #1918 from dongluochen/IPv6Support
...
Fix IPv6 address format issue
2016-03-02 11:36:18 -08:00
045bfe93d1
Merge pull request #1845 from thaJeztah/fix-api-markdown
...
Update Swarm API documentation
2016-03-02 11:23:04 -08:00
bf5c744a49
Check port range. Add more unit tests for address format.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-02 11:01:48 -08:00
5ce850f0f4
Merge pull request #1903 from wenchma/typo
...
Fix some typo error for install-manual.md
2016-03-02 10:34:35 -08:00
bc27cedd8c
Godep update github.com/docker/docker/pkg/...
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-02 10:04:03 -08:00
c73f17fb6e
Support IPv6 address format.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-02 10:04:03 -08:00
f6131d0331
Merge pull request #1917 from friism/patch-1
...
avoid syntax highlighter confusion
2016-03-02 09:44:52 -08:00
03b8481f01
avoid syntax highlighter confusion
...
Signed-off-by: Michael Friis <friism@gmail.com>
2016-03-02 09:08:37 -08:00
05d9995985
Proposed fix for https://github.com/docker/swarm/issues/1847
...
* Fix cluster.Volumes.Get() call for volumes with non-local drivers
* Added tests for clusterVolumes.Get()
Signed-off-by: Eugene Chupriyanov <tchu@tchu.ru>
2016-03-02 13:40:32 +03:00
7e9c6bd963
Merge pull request #1916 from vieux/bump_1.1.3-rc2
...
bump to 1.1.3-rc2
2016-03-01 16:56:57 -08:00
47bc7cd93a
Merge pull request #1909 from dongluochen/FrequentIntegrationTestFailure
...
Remove internal retry in discovery_check_swarm_info
2016-03-01 15:38:18 -08:00
8dc09aafe0
bump to 1.1.3-rc2
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-01 14:59:23 -08:00
e25da7e9bd
Merge pull request #1907 from dongluochen/TcpConnectionLeak
...
Close TCP connections at disconnect
2016-03-01 14:29:41 -08:00
87a03b9157
Close TCP connections at disconnect.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-01 13:48:58 -08:00
984aab2999
Merge pull request #1910 from JohnKDay/patch-1
...
Syntax error - changed container to constraint
2016-03-01 09:03:03 -08:00
e94ca74a6a
Syntax error - changed container to constraint
...
Syntax Error
From:
The `<filter-type>` is either the `affinity` or the `container` keyword. It
identifies the type filter you intend to use.
To:
The `<filter-type>` is either the `affinity` or the `constraint` keyword. It
identifies the type filter you intend to use.
Signed-off-by: John Day <john@containerx.io>
2016-03-01 04:11:29 +00:00
0039ed3b5e
Merge pull request #1908 from duglin/missingDefer
...
Add missing 'defer'
2016-02-29 18:31:46 -08:00
4dc645bb8a
Add missing 'defer'
...
as it stands now the lock at this spot in the code is pretty useless.
All it does it block us but since we release the lock before we check
e.state its a roadblock with no real purpose.
One could argue that a lock isn't needed at all but I think having it
there for consistency with the other funcs would be good.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-02-29 13:51:10 -08:00
f5187e9938
Remove internal retry in discovery_check_swarm_info because caller retries are already in place.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-29 13:48:59 -08:00
6e4ad3f093
Fix some typo error for install-manual.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-29 11:42:40 +08:00
b43a2c21c4
Merge pull request #1817 from moxiegirl/test-swarm-at-scale
...
Fixing problems with the instructions
2016-02-27 09:10:49 -08:00
ec8ceae209
Fixing problems with the instructions
...
Updating the application after test
Removing the sudo as it caused issues
Adding new screen shots
Breaking into several files/sections
Adding in the alias from the old single page version
Moving to old path to avoid an alias
Adding in Dong's comments
Updating with latest fixes
Fixing nits and more
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-27 09:04:49 -08:00
7f6f9e518c
Merge pull request #1901 from moxiegirl/carry-close-1886
...
Reformat to make it look more graceful
2016-02-27 08:35:37 -08:00
482830b296
Reformat to make it look more graceful
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Fixing formatting carry and close #1886
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-27 08:28:52 -08:00
82e5aecc05
Merge pull request #1898 from vieux/more_check_test
...
add even more tests on rescheduling
2016-02-26 15:28:26 -08:00
Dongluo Chen