Commit Graph

2540 Commits

Author SHA1 Message Date
Alexandre Beslic d9c677f50b Merge pull request #1697 from jimenez/double_start
Fix double start with Mesos
2016-02-01 09:08:20 -08:00
Isabel Jimenez c809e6a643 Fix double start
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-31 19:08:48 -05:00
moxiegirl f7c7ec09f8 Merge pull request #1645 from mgoelzer/improve-contributing
Improve CONTRIBUTING.md for beginners
2016-01-30 18:13:08 -08:00
moxiegirl 833471b74c Merge pull request #1505 from ahaurw01/docs-what-if-hosted-discovery-down
Add a note to install-w-machine with pointers if hosted discovery is down
2016-01-30 18:10:37 -08:00
Aaron Haurwitz 460c4ce9a7 Fix the format of bold note.
Signed-off-by: Aaron Haurwitz <aaron.haurwitz@gmail.com>
2016-01-30 10:20:20 -05:00
Victor Vieux e98456ea78 Merge pull request #1688 from Spritekin/master
Fixes swarm overloading slaves when using the mesos drivers.
2016-01-29 16:35:50 -08:00
Alexandre Beslic f86f41ba09 Merge pull request #1712 from vieux/hostdown_ps
Host Down containers in ps requires -a
2016-01-29 15:38:40 -08:00
Nishant Totla 15b7ac023d Merge pull request #1711 from dongluochen/validationDelay
Allow more retries for node validation
2016-01-29 15:07:47 -08:00
Dong Chen 388b7b132f Allow more retries for node validation.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-29 13:26:42 -08:00
Chanwit Kaewkasi 1fa6cd9c55 Merge pull request #1707 from vieux/improve_logs_and_lock
Improve logs and fix lock in engine
2016-01-30 04:02:50 +07:00
Victor Vieux f08f47044e Merge pull request #1706 from jimenez/rename_agent
Renaming agent in README
2016-01-29 11:42:04 -08:00
Isabel Jimenez d86226dfb3 Renaming agent in README
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-29 14:32:23 -05:00
Alexandre Beslic 82261a7df4 Merge pull request #1701 from vieux/reschedule_swarm_only
remove duplicate container only from swarm
2016-01-28 15:25:24 -08:00
Victor Vieux 4ce93c1997 Merge pull request #1696 from nishanttotla/update-apiversion-regex
Extracting apiversion from HTTP request
2016-01-28 13:33:28 -08:00
Victor Vieux 2cc980e4ab check the container started successfully after reschedule
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 11:47:48 -08:00
Alexandre Beslic ecb137ebaf Merge pull request #1695 from vieux/update_to_go_1.5.3
update_to_go_1.5.3
2016-01-28 11:34:01 -08:00
Victor Vieux aa028f4d09 Host Down containers in ps requires -a
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 11:28:19 -08:00
Nishant Totla 4467298b62 Extracting apiversion from HTTP request
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-28 11:14:56 -08:00
Victor Vieux 25b61791a5 improve rescheduling logs
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 08:25:28 -08:00
Victor Vieux 188b3fd00d change rlock to lock
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 08:25:13 -08:00
Victor Vieux fbab9d05ba reschedule swarm container only
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-28 03:17:34 -08:00
Victor Vieux d1ba0fdf87 Merge pull request #1684 from vieux/update_info
Update info
2016-01-27 14:09:06 -08:00
Dongluo Chen 2f5b1a8d4d Merge pull request #1687 from vieux/fix_filter_network_global
fix network filter with global network
2016-01-27 11:35:10 -08:00
Victor Vieux 6b451b2d8c Merge pull request #1690 from dongluochen/testValidation
swarm_manage should confirm nodes pass validation
2016-01-27 10:30:58 -08:00
Victor Vieux 80ffd860cb update_to_go_1.5.3
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 03:13:47 -08:00
Victor Vieux f3a1027bbe update docker info
add test

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 01:07:52 -08:00
Victor Vieux 5e3affa677 update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 01:07:52 -08:00
Dong Chen 0b6d390d66 swarm_manage should confirm nodes pass validation.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-26 18:47:51 -08:00
Guillermo Rodriguez b830f9f269 Fixes swarm overloading slaves when using the mesos drivers.
The problem is described here:
https://github.com/docker/swarm/issues/1588

This fix also allows reducing the offer timeout which reduces problems with mesos resource consolidation described here:
https://github.com/docker/swarm/issues/1655

Signed-off-by: Guillermo Rodriguez <grodriguez@cmcrc.com>
2016-01-27 12:25:45 +11:00
Alexandre Beslic b3aab8455d Merge pull request #1677 from moxiegirl/new-navigation
Swarm new navigation for 1.10
2016-01-26 11:45:20 -08:00
Victor Vieux 4194778242 fix network filter with global network
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-26 11:03:26 -08:00
Mike Goelzer 0857d026bc Improve CONTRIBUTING.md for beginners
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>
2016-01-25 17:09:46 -08:00
Dongluo Chen be96293bc8 Merge pull request #1683 from dongluochen/invalidEngine
Provide error when engine version is unsupported
2016-01-25 16:50:32 -08:00
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
Mary Anthony c2ecf7f9f3 Adding new navigation
Moving API to top level
Fixing broken links to api

Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-24 09:02:53 -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