Victor Vieux
3747ec9b9f
change refresh logic with new events
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-10 00:48:31 -08:00
Victor Vieux
5492f4ab82
remove refresh networks
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-09 20:14:58 -08:00
Victor Vieux
7447576786
Merge pull request #1746 from vieux/use_alpine_golang
...
use golang:1.5.3-alpine in Dockerfile
2016-02-08 17:39:22 -08:00
Alexandre Beslic
31a3b07b08
Merge pull request #1772 from vieux/update-compose
...
update compose in tests to 1.6.0
2016-02-08 14:16:23 -08:00
Victor Vieux
8f697912fe
Merge pull request #1768 from moxiegirl/fix-link-stuff
...
Fixing links after move of repo
2016-02-07 20:01:34 -08:00
Mary Anthony
c48aa79979
Fixing links after move of repo
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-07 19:52:22 -08:00
Victor Vieux
6f58c870a4
update compose in tests to 1.6.0
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-06 05:42:50 -08:00
Victor Vieux
c9ee9af4d3
Merge pull request #1743 from vieux/new_maintainers
...
add amitshukla, moxiegirl and nishanttotla to the MAINTAINERS file
2016-02-05 13:39:31 -08:00
Dongluo Chen
ba03f68b74
Merge pull request #1762 from thaJeztah/fix-api-link
...
Fix broken links in README
2016-02-04 17:26:55 -08:00
Sebastiaan van Stijn
aa474f59b5
Fix broken links in README
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 02:07:07 +01:00
Alexandre Beslic
e83b619650
Merge pull request #1761 from nishanttotla/label_affinity_parallel
...
Fix integration test - label affinity in parallel
2016-02-04 15:35:19 -08:00
Nishant Totla
c22d7fd78b
Fix integration test - label affinity in parallel
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-04 15:14:46 -08:00
Victor Vieux
a0fd82b909
Merge pull request #1759 from vieux/update_changelog
...
update date in changelog
2016-02-04 10:56:56 -08:00
Victor Vieux
0e34e8d736
update date in changelog
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-02-04 10:54:46 -08:00
Victor Vieux
573dd33995
Merge pull request #1757 from moxiegirl/fix-format
...
Fix format for command
2016-02-04 10:50:56 -08:00
Alexandre Beslic
6ca3f2fdd2
Merge pull request #1758 from runseb/patch-1
...
Update networking.md
2016-02-04 10:13:59 -08:00
runseb
e121dd0986
Update networking.md
...
Small typo in bridge driver when creating bridge network.
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2016-02-04 14:46:43 +01:00
Mary Anthony
a1e183c4bd
Fix format for command
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-04 05:13:19 -08:00
Dongluo Chen
d5a3ff10af
Merge pull request #1756 from vieux/remove_goveralls
...
remove goveralls
2016-02-04 00:50:33 -08:00
Victor Vieux
46b57a3cbe
Merge pull request #1753 from SvenDowideit/rolfes-second-doc-branch-carry
...
new content for install-on-aws and images for other topics
2016-02-03 17:47:00 -08:00
Victor Vieux
45ab44d142
remove goveralls
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-03 17:36:48 -08:00
Rolfe Dlugy-Hegwer
b88cb64358
new content for install-on-aws and images for other topics
...
Issues #1606 #1605
Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
2016-02-03 17:13:56 -08:00
Victor Vieux
b8f2fd969e
Merge pull request #1755 from air/patch-1
...
fix bullet list in last paragraph
2016-02-03 16:56:26 -08:00
Aaron Bell
6ab88246cf
fix bullet list in last paragraph
...
Signed-off-by: Aaron Bell <aaron.bell@gmail.com>
2016-02-03 16:29:20 -08:00
Victor Vieux
1bb8ad2dfd
Merge pull request #1754 from SvenDowideit/update-menu-and-add-toolbox
...
Move the get-swarm doc into the new DockerSwarm menu
2016-02-03 16:16:54 -08:00
Sven Dowideit
be31e00c09
Move the get-swarm doc into the new DockerSwarm menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-02-03 16:14:44 -08:00
Victor Vieux
8a1fe8ff75
Merge pull request #1751 from jimenez/known_issues
...
Adding Known issues and Fucntionality to README
2016-02-03 14:12:06 -08:00
Isabel Jimenez
da1e5bcb24
Adding Known issues and Fucntionality to README
...
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-02-03 16:44:34 -05:00
Victor Vieux
658280c5d7
Merge pull request #1694 from moxiegirl/securing-swarm
...
High-level docs for Swarm
2016-02-03 13:13:19 -08:00
Mary Anthony
2dd1f47c5b
Updating with Dong's fine
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 12:45:25 -08:00
Victor Vieux
5557849a2c
Merge pull request #1718 from moxiegirl/swarm-1.10-docs
...
How to get Swarm and Machine provisioning
2016-02-03 12:42:58 -08:00
Mary Anthony
f93d787e3b
WIP: TLS Docs for Swarm
...
Struct edit pass thru conceptual material
Updating with comments from Mike
Tweaking menu layout
Updating for Nigel
Updating with local images, formatting fixes
Updating with the comments from review
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 10:37:54 -08:00
Mary Anthony
c1b5c9c49c
Adding get-swarm and fix for #1580
...
Fixing duplicate PR
Updating get-swarm
Removing the fix for fix for #1580
Update with MB comments
Fixing note
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 06:01:01 -08:00
Victor Vieux
9a45eaedbd
use golang:1.5.3-alpine in Dockerfile
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 23:41:03 -08:00
Victor Vieux
342611313e
Merge pull request #1745 from vieux/bump-1.1.0-rc3
...
Bump version to 1.1.0-rc3
2016-02-02 22:29:51 -08:00
Victor Vieux
88e5a792be
Bump version to 1.1.0-rc3
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 20:36:51 -08:00
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
Victor Vieux
d8ef7046a7
add amitshukla, moxiegirl and nishanttotla to the MAINTAINERS file
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-02 18:18:42 -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