Commit Graph

2724 Commits

Author SHA1 Message Date
Alexandre Beslic 0039ed3b5e Merge pull request #1908 from duglin/missingDefer
Add missing 'defer'
2016-02-29 18:31:46 -08:00
Doug Davis 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
moxiegirl b43a2c21c4 Merge pull request #1817 from moxiegirl/test-swarm-at-scale
Fixing problems with the instructions
2016-02-27 09:10:49 -08:00
Mary Anthony 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
moxiegirl 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
wenchma 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
Victor Vieux 82e5aecc05 Merge pull request #1898 from vieux/more_check_test
add even more tests on rescheduling
2016-02-26 15:28:26 -08:00
Victor Vieux ef99401539 Merge pull request #1896 from gradywang/issue-typos
Find some typos when browse the code, fix them in this patch.
2016-02-26 11:37:40 -08:00
Yongqiao Wang ddce40187c Find some typos when browse the code, fix them in this patch.
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-02-26 20:16:39 +08:00
Victor Vieux d731f16279 add even more tests on rescheduling
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-26 02:00:06 -08:00
Nishant Totla 4619c85bc0 Merge pull request #1894 from allencloud/add-CORS-allow-method-HEAD
Add method HEAD in options response headers
2016-02-25 23:38:42 -08:00
Sun Hongliang a718e90662 Add method HEAD in options response headers
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-02-26 11:02:18 +08:00
Nishant Totla 063b63e76a Merge pull request #1874 from allencloud/validate-label's-format
Fix #1873 force to validate engine's label format
2016-02-25 16:22:27 -08:00
Morgan Bauer 5fc06f746c Merge pull request #1869 from allencloud/fix-cors-bugs
Fix CORS bug #1868
2016-02-25 14:11:31 -08:00
Sun Hongliang aa6ff494e4 Fix #1873
force to validate whether engine's label is like format "key=value"

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-02-25 12:58:25 +08:00
allencloud c39194cc4c Fixes #1868
1.Fixes cors bug
2.Add cors test

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-02-25 10:35:57 +08:00
Victor Vieux da37fb5c7b Merge pull request #1877 from vieux/bump_1.1.3
bump to 1.1.3
2016-02-24 16:02:08 -08:00
Victor Vieux 90fa1d3ee5 bump to 1.1.3
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-24 15:01:29 -08:00
moxiegirl 9617bdb860 Merge pull request #1875 from moxiegirl/carry-close-1852
Fixed typos and formatting issues.
2016-02-24 09:28:03 -08:00
moxiegirl 638709a2d7 Merge pull request #1876 from moxiegirl/carry-and-close-1836
Add commands reference to the Swarm documentation
2016-02-24 09:21:07 -08:00
Rolfe Dlugy-Hegwer b9f7b8a91a Fixed typos and formatting issues.
Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-24 09:17:06 -08:00
Rolfe Dlugy-Hegwer e8fad3d657 command reference and docker file 22:05
fix bad links

Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
2016-02-24 08:44:58 -08:00
Alexandre Beslic a839ebdd06 Merge pull request #1864 from vieux/check_rm_resh
make sure all the rescheduled containers were removed
2016-02-23 21:14:11 -08:00
Victor Vieux 8910c586f8 make sure all the rescheduled containers were removed
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-23 18:28:21 -08:00
Alexandre Beslic a904eec54f Merge pull request #1863 from vieux/update_compose
update compose to 1.6.2
2016-02-23 17:42:26 -08:00
Victor Vieux a7a942192f update compose to 1.6.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-23 16:41:58 -08:00
Victor Vieux 02296dc1f2 Merge pull request #1855 from vieux/net_node_run
support docker run --net <node>/<network>
2016-02-23 14:22:49 -08:00
Victor Vieux 22fedf0db0 support docker run --net <node>/<network>
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-23 13:13:31 -08:00
Nishant Totla 633a2ba065 Merge pull request #1856 from vieux/add_reschedule_compose_test
add a reschedule test with compose
2016-02-23 11:40:57 -08:00
Nishant Totla 4f3c23cbee Merge pull request #1858 from skohar/remove_redundant_space
Remove redundant spaces
2016-02-23 11:19:58 -08:00
skohar 744a811206 Remove redundant spaces
Signed-off-by: skohar <skohar@users.noreply.github.com>
2016-02-23 11:40:27 +09:00
Victor Vieux d97c06207d add a reschedule test with compose
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-22 16:58:21 -08:00
Victor Vieux bc440060f1 Merge pull request #1843 from dongluochen/ConnectionLeak-fix
Do not recycle connections. Let net/http handles connections.
2016-02-22 16:53:26 -08:00
Alexandre Beslic c363c31608 Merge pull request #1850 from vieux/dont_erase_hostconfig
don't erase hostconfig on refresh
2016-02-22 14:46:11 -08:00
Sven Dowideit bb9f0d2861 Merge pull request #1844 from thaJeztah/remove-tutorials
Remove tutorials from Dockerfile
2016-02-20 03:49:28 -08:00
Dong Chen acf09695f7 Skip one test in Docker 1.9 for runC bug.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-19 22:33:39 -08:00
Dong Chen 06ef4a99e6 Test connection count between swarm manager and nodes.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-19 18:29:49 -08:00
Dong Chen e51566d255 Remove closeIdleConnections function.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-19 14:45:15 -08:00
Sebastiaan van Stijn 0adeae325e Remove tutorials from Dockerfile
The "docker/tutorials" repository is now
private, causing building the docs to fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-19 13:02:06 +01:00
Dong Chen 69535f167a Do not recycle connections. Let net/http handles connections.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-18 18:02:10 -08:00
Victor Vieux f947993ec0 Merge pull request #1842 from vieux/bump-1.1.2
bump 1.1.2
2016-02-18 11:04:29 -08:00
Victor Vieux 8debc534ce Merge pull request #1833 from vieux/test_p_compose
revert startconfig breaking change
2016-02-18 10:54:49 -08:00
Victor Vieux 854cad3c14 don't erase hostconfig on refresh
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-18 10:01:26 -08:00
Victor Vieux d4f9ae3d95 bump 1.1.2
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-18 00:18:03 -08:00
Victor Vieux 358ac5729a remove debug
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 16:09:35 -08:00
Victor Vieux f3a1d58fe3 Revert "Testcase start container with hostconfig"
This reverts commit 3dff7aa96a.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:51 -08:00
Victor Vieux c42142e408 Revert "Passing HostConfig for /start endpoint"
This reverts commit 6ff0d29c9d.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:37 -08:00
Victor Vieux d49db6afaf add test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:45:45 -08:00
Victor Vieux 39ca8e97eb Merge pull request #1832 from vieux/bump-1.1.1
bump 1.1.1
2016-02-17 14:45:56 -08:00
Victor Vieux ccad86bb86 bump 1.1.1
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 14:15:15 -08:00