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
Sebastiaan van Stijn
f9aca81b67
Update Swarm API documentation
...
This updates the Swarm API documentation;
- Fix heading levels (changed H1 -> H2)
- Replace the "Endpoints which behave differently" with a table
- Fix Markdown markup in "Registry Authentication" section
- Changed the "Registry Authentication" examples from a bullet-list
to sub-sections and promoted "token-based authentication" as the preferred
authentication method (adding notes that password-based authentication
stores credentials unencrypted)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-19 12:59:58 +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
Dongluo Chen
13ffd7de16
Merge pull request #1829 from nishanttotla/1781-pass-host-config
...
Passing HostConfig for /start endpoint
2016-02-17 14:00:43 -08:00
Nishant Totla
6ff0d29c9d
Passing HostConfig for /start endpoint
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-17 11:06:51 -08:00
Sverre Boschman
3dff7aa96a
Testcase start container with hostconfig
...
Signed-off-by: Sverre Boschman <s.r.boschman@gmail.com>
2016-02-17 11:08:29 +01:00
Nishant Totla
d44bef5911
Merge pull request #1825 from abronan/add_report
...
doc: add go report badge on README.md
2016-02-16 22:37:33 -08:00
Alexandre Beslic
c318a6f48a
doc: add go report badge on README.md
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-02-16 21:45:11 -08:00
Nishant Totla
204a51c805
Merge pull request #1822 from thaJeztah/fix-maintainers-file
...
Fix MAINTAINERS file
2016-02-16 08:45:37 -08:00
Sebastiaan van Stijn
b50c9036dd
Fix MAINTAINERS file
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-16 17:04:10 +01:00
Victor Vieux
ad232fcec6
Merge pull request #1813 from dongluochen/enginePanic
...
Lock engine to prevent read/write conflict on engine `containers` map
2016-02-12 16:26:00 -08:00
Dong Chen
bfc556613b
Lock engine to prevent simultaneous change on `containers` map.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-12 15:34:15 -08:00
moxiegirl
1fab0aed5a
Merge pull request #1797 from nishanttotla/improve-swarm-machine
...
Removing hard-coded ips from swarm w/ machine doc
2016-02-12 13:23:56 -08:00
Alexandre Beslic
185a50ff17
Merge pull request #1804 from dongluochen/nodeManagementTest
...
Add nodemanagement tests to test pipeline
2016-02-12 10:26:36 -08:00
Alexandre Beslic
fc8341bc39
Merge pull request #1800 from vieux/do_no_lower
...
do not lower keys
2016-02-12 10:17:39 -08:00
Dong Chen
87c38f4641
Include nodemanagement tests.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-12 10:06:57 -08:00
Victor Vieux
abb38d9a11
Merge pull request #1807 from vieux/remove_coverage_completly
...
remove coverage testing for good
2016-02-12 09:48:57 -08:00
Chanwit Kaewkasi
fce3620235
Merge pull request #1794 from dongluochen/refreshBackoffOnFailure
...
Implement engine refresh backoff strategy for failing nodes
2016-02-12 19:58:08 +07:00
Victor Vieux
ab087aacef
remove coverage testing for good
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 19:17:54 -08:00
Dongluo Chen
d5033258a6
Merge pull request #1803 from skohar/fix_typo
...
Fix typo
2016-02-11 16:28:09 -08:00
skohar
eb725973a2
Fix typo
...
Signed-off-by: skohar <skohar@users.noreply.github.com>
2016-02-12 09:21:34 +09:00
Alexandre Beslic
3c044d045c
Merge pull request #1777 from vieux/remove_refresh_networks
...
remove refresh networks from cluster to improve perfs
2016-02-11 15:47:44 -08:00
Dong Chen
b03bf75557
Implement engine refresh backoff strategy for failing nodes. Use a backoff factor so the backoff speed is relative to user setting.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-11 15:37:17 -08:00
Alexandre Beslic
a3d1f9fdc5
Merge pull request #1791 from vieux/use_same_client
...
use same HTTP client as dockerengine
2016-02-11 15:29:21 -08:00
Victor Vieux
64b9c50b69
use same HTTP client as dockerengine
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:03:38 -08:00
Nishant Totla
ee39394741
Removing hard-coded ip from swarm w/ machine doc
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-11 14:27:09 -08:00