Commit Graph

2583 Commits

Author SHA1 Message Date
Victor Vieux cbfdb37fde Merge pull request #1744 from nishanttotla/UpdateAPIVersion
Bump API version
2016-02-02 19:01:26 -08:00
Nishant Totla a67d3ef125 Bump API version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-02 18:40:03 -08:00
Victor Vieux 011b6c9c49 Merge pull request #1742 from dongluochen/internalNetwork
Update dockerclient to support network create `--internal` flag
2016-02-02 18:21:00 -08:00
Alexandre Beslic 89c4b2b4a5 Merge pull request #1740 from vieux/fix_disconnect_and_random_-f
support disconnect -f and use random engine
2016-02-02 18:00:00 -08:00
Dong Chen 77b4f98b3b Update dockerclient to support network create `--internal` flag.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-02 17:55:15 -08:00
Victor Vieux 5347098def support disconnect -f and use random engine
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 16:47:45 -08:00
Dongluo Chen 8aff2084b7 Merge pull request #1739 from vieux/support_filter_network_ls
support docker network ls --filter type=XXX
2016-02-02 16:16:54 -08:00
Victor Vieux 24fe2c04e5 support docker network ls --filter type=XXX
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 15:57:53 -08:00
Dongluo Chen 5ab32d0705 Merge pull request #1735 from vieux/update_dockerclient
update dockerclient
2016-02-02 15:33:38 -08:00
Alexandre Beslic eb5bcbdaba Merge pull request #1732 from Uhsac/fix-typo-in-scheduler-docs
Fix three typo in docs/scheduler/filter.md
2016-02-02 13:41:09 -08:00
Clément Aigreault 3ece47ff91 Fix three typo in docs/scheduler/filter.md
dafult -> default
by by -> by
want run -> want to run

Signed-off-by: Clément Aigreault <aigreaultc@gmail.com>
Signed-off-by: Uhsac <aigreaultc@gmail.com>
2016-02-02 22:09:55 +01:00
Victor Vieux f26a50a483 update dockerclient
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 12:08:09 -08:00
Alexandre Beslic 76d0171319 Merge pull request #1729 from dongluochen/errHandlingCompatibility
Ignore 404 error from old engine versions
2016-02-02 10:16:59 -08:00
Dong Chen 388b8fd50f Only record connection failure error in error message.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-01 22:30:36 -08:00
Dong Chen 3a99c4ca85 Ignore 404 error. Remove trailing white spaces from error, including new lines.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-01 20:44:36 -08:00
Dongluo Chen 58baa9ea29 Merge pull request #1728 from vieux/restart_events_on_EOF
retry monitor events on EOF
2016-02-01 19:07:26 -08:00
Alexandre Beslic 79f255355d Merge pull request #1726 from vieux/more_network_tests
add docker run --net-alias, docker network connect --ip and docker network connect --alias tests
2016-02-01 16:08:54 -08:00
Alexandre Beslic b450039172 Merge pull request #1725 from vieux/add_simple_strategy_test
add simple strategy test
2016-02-01 15:52:29 -08:00
Isabel Jimenez 8ddb324a9e Merge pull request #1633 from ezrasilvera/mesosCreateNW
New network functions for mesos cluster: CreateNetwork(), RemoveNetwork(), and Networks()
2016-02-01 15:17:19 -08:00
Dongluo Chen 142197258b Merge pull request #1724 from nishanttotla/1689-UnknownPendingNodes
Adding default name (unknown) for pending engine
2016-02-01 13:38:26 -08:00
Victor Vieux f0667cd5bb Merge pull request #1714 from vieux/soft_fix
fix soft / resource computation
2016-02-01 13:11:22 -08:00
Dongluo Chen 615158432d Merge pull request #1723 from vieux/test_run_ip
add test for run --ip
2016-02-01 13:04:32 -08:00
Victor Vieux 36e1fbdd77 Merge pull request #1715 from vieux/1676-fiximageaffinity
Fix images affinity for local registry and digest
2016-02-01 13:01:29 -08:00
Nishant Totla 16de94b9b1 Adding default name (unknown) for pending engine
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-01 12:54:37 -08:00
moxiegirl e9cd4ff2a6 Merge pull request #1382 from xcl3721/patch-2
make the command clearly
2016-02-01 11:51:10 -08:00
Victor Vieux 336a4ff9ae Merge pull request #1721 from nishanttotla/1625-RemoveInfoBackspaces
Removing backspaces in /info output for new API version
2016-02-01 09:30:51 -08:00
Victor Vieux bb0acf7660 Merge pull request #1568 from abronan/doc_docker_daemon_background
docs: add note for the case of the daemon being started through ssh
2016-02-01 09:09:40 -08:00
Alexandre Beslic d9c677f50b Merge pull request #1697 from jimenez/double_start
Fix double start with Mesos
2016-02-01 09:08:20 -08:00
Ezra Silvera 5d63e55936 add integration network test
Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2016-02-01 08:32:05 -05:00
Ezra Silvera 8232a897c6 Implement network functions for mesos cluster: CreateNetwork(),
RemoveNetwork(), and Networks()

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

Adding error messages

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

fix formatting

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>

fix formatting

Signed-off-by: Ezra Silvera <ezra@il.ibm.com>
2016-02-01 08:12:06 -05:00
Nishant Totla 3d7678389f Removing backspaces in /info output for new API version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-31 23:54:33 -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 e85868c70c docs: add note for the case of the daemon being started through ssh
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2016-01-29 11:28:43 -08:00
Victor Vieux 1be46e7e58 retry monitor events on EOF
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 09:32:29 -08:00
Victor Vieux cef0b554d7 update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 07:54:16 -08:00
Victor Vieux 97749f3f2d add docker run --net-alias, docker network connect --ip and docker network connect --alias tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 06:04:55 -08:00
Victor Vieux 47609f74f3 add simple strategy test
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 05:50:09 -08:00
Victor Vieux 9f9aba623f update godeps
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 03:04:17 -08:00
Victor Vieux 9abd727c52 add test for run --ip
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-29 01:16:48 -08: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