Commit Graph

2505 Commits

Author SHA1 Message Date
Dong Chen abffebf09e Provide error when engine version is unsupported.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-25 15:58:48 -08:00
Victor Vieux cc4eea83da Merge pull request #1669 from dongluochen/dockerUpdateCmd
Support 'docker update' command
2016-01-22 17:43:41 -08:00
Dong Chen f42f5fa3d4 Support 'docker update' command.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-22 17:10:22 -08:00
Victor Vieux 7c41b95b8e Merge pull request #1672 from jimenez/mesos0.26
Upgrading Mesos integration tests to 0.26.0
2016-01-22 17:03:38 -08:00
Alexandre Beslic 50ad1548d9 Merge pull request #1666 from vieux/volumes_name
allow engine/name support in volumes
2016-01-22 16:46:24 -08:00
Isabel Jimenez b290a62342 Adding mesos 0.26 Dockerfile for tests
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-22 17:56:48 -05:00
Victor Vieux 5978ee4b22 Merge pull request #1670 from vieux/cross_compile_travis_again
enable cross compile in travis again
2016-01-22 12:53:28 -08:00
Victor Vieux 5cb6f218dd Merge pull request #1662 from dongluochen/avoidSimultaneousValidation
Enforce minimum backoff to avoid simultaneous validation on one engine
2016-01-21 14:19:06 -08:00
Dong Chen 46a33f70ff Use exponential backoff strategy to validate pending engine.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-21 14:02:34 -08:00
Dongluo Chen cd68850690 Merge pull request #1665 from vieux/type_changelog
update year typo in the CHANGELOG
2016-01-21 13:53:50 -08:00
Alexandre Beslic 63f1d757a3 Merge pull request #1657 from vieux/add_spread_tests
Add more unit tests for spread strategy
2016-01-21 11:08:16 -08:00
Dong Chen 14bfc52d36 Enforce minimum backoff to avoid simultaneous validation on one engine.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-20 17:49:40 -08:00
Alexandre Beslic 8f31d014e4 Merge pull request #1658 from dongluochen/raceValidation
Fix a race condition in pending engine validation
2016-01-20 10:47:34 -08:00
Dong Chen 39dc28a4df Fix a race condition in pending engine validation, discard parallel validation result.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-19 16:19:09 -08:00
Victor Vieux 05f9a6a6fb Merge pull request #1654 from dongluochen/darwinbuild
Mac build fix
2016-01-18 17:13:00 -08:00
Dong Chen 180bc90b1b Mac build fix
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-18 16:54:22 -08:00
Victor Vieux 3a5499040f Merge pull request #1642 from dongluochen/tcpUserTimeout
Tcp user timeout
2016-01-18 16:29:12 -08:00
Dong Chen 15c9dbaee0 Support TCP_USER_TIMEOUT for Linux and its equivalent in Mac
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-18 15:46:27 -08:00
Dongluo Chen af89c1e94a Merge pull request #1652 from vieux/update_events_1.10
Update events 1.10
2016-01-18 15:16:04 -08:00
Victor Vieux c6de0c3dc6 update some comments
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 21:08:00 -08:00
Victor Vieux c9e3b7dda3 enable cross compile in travis again
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 20:41:32 -08:00
Victor Vieux 13d2212a3a rename 2 handlers
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 20:29:59 -08:00
Victor Vieux 1225eddc79 allow engine/name support in volumes
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 17:40:53 -08:00
Victor Vieux f42d697315 update year typo in the CHANGELOG
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 13:45:46 -08:00
Victor Vieux ab113e7750 Add more unit tests for spread strategy
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 00:25:50 -08:00
Victor Vieux 04fb48d27a support 1.10 events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-15 19:35:04 -08:00
Victor Vieux d884fe563b update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-15 18:30:36 -08:00
Dongluo Chen 68d053113d Merge pull request #1641 from nishanttotla/fix-typos-release-checklist
Fixing typo in RELEASE-CHECKLIST.md
2016-01-14 17:38:35 -08:00
Nishant Totla 04781ef4c6 Fixing typo in RELEASE-CHECKLIST.md
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-14 17:32:55 -08:00
Victor Vieux b63b05aabb Merge pull request #1640 from vieux/bump-v1.1.0-rc1
Bump version to 1.1.0-rc1
2016-01-14 15:42:31 -08:00
Victor Vieux 7b142f5642 Bump version to 1.1.0-rc1
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-01-14 13:21:48 -08:00
Victor Vieux f883a6d508 Merge pull request #1637 from jimenez/launch_bad_timeout
Launch bad timeout
2016-01-14 11:01:45 -08:00
Isabel Jimenez a99ceeb9c1 Adding suicide logic for tasks so as to prevent false timeout for tasks having a long image pull
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 13:37:23 -05:00
Isabel Jimenez d12ea7ff6d Adding test
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 13:37:23 -05:00
Victor Vieux 08839f62fa Merge pull request #1636 from jimenez/checkpoint_failover
Enabling checkpoint failover in FrameworkInfo
2016-01-14 10:18:09 -08:00
Victor Vieux d3e4ddb0f7 Merge pull request #1635 from jimenez/task_timeout_restructure
Removing Queue package and regrouping task logic
2016-01-14 10:18:03 -08:00
Isabel Jimenez b297c1bd41 Enabling checkpoint failover in FrameworkInfo
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 04:05:00 -05:00
Isabel Jimenez fe8da8fe80 Removing Queue package and regrouping task logic
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-14 03:52:11 -05:00
Victor Vieux 71edffc019 Merge pull request #1627 from vieux/update_api_version
add buildtime, kernelversion and experimental to API version
2016-01-13 17:41:28 -08:00
Alexandre Beslic 11b2dc6ec7 Merge pull request #1628 from dongluochen/createRetry
Add swarm scheduler retry option
2016-01-13 17:15:36 -08:00
Dong Chen 8cc9b6c284 Add swarm container create retry option.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-13 16:06:38 -08:00
Alexandre Beslic d21748699d Merge pull request #1565 from jimmyxian/fresh-image-when-commit
fresh image when receive commit event
2016-01-13 12:01:09 -08:00
Victor Vieux 985974854c Merge pull request #1630 from jimenez/driver_join
Adding observe async for driver abort/errors
2016-01-13 11:47:10 -08:00
Dongluo Chen 723a6c724f Merge pull request #1632 from thaJeztah/fix-incorrect-link
Remove link to experimental "rescheduling"
2016-01-13 10:59:31 -08:00
Sebastiaan van Stijn cdc2cc3d84 Remove link to experimental "rescheduling"
It's in experimental, so should not be linked
from in the online documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-13 09:27:34 -08:00
Isabel Jimenez 9bfc28c291 Adding obeserve async for driver abort/errors
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-13 04:46:45 -05:00
Victor Vieux 0e4ebbf61d Merge pull request #1626 from vieux/experimental
add -experimental to enable rescheduling
2016-01-12 18:00:36 -08:00
Alexandre Beslic 254e095f77 Merge pull request #1601 from vieux/docker_discovery
use docker/docker/pkg/discovery and update godeps
2016-01-12 17:06:51 -08:00
Victor Vieux 18b6435839 Merge pull request #1621 from jimenez/scheduler_driver
Restructuring mesos scheduler driver outside of Cluster
2016-01-12 17:02:35 -08:00
Isabel Jimenez 443d49167a Restructuring mesos scheduler driver outside of Cluster
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-12 19:24:50 -05:00