Dongluo Chen
|
7952727bb7
|
Merge pull request #1793 from vieux/flacky_before_test
fix flacky before tests
|
2016-02-10 17:27:58 -08:00 |
|
Victor Vieux
|
36e7dc8509
|
Merge pull request #1773 from dongluochen/rescheduleTest
Verify rescheduled containers are started properly
|
2016-02-10 16:28:09 -08:00 |
|
Victor Vieux
|
97b879495a
|
Merge pull request #1792 from vieux/remove_cover_readme
remove coverage from the README since we don't use it anymore
|
2016-02-10 16:09:20 -08:00 |
|
Victor Vieux
|
6fba0987ba
|
Merge pull request #1789 from vieux/severversion_info
add Server Version to docker info
|
2016-02-10 13:42:22 -08:00 |
|
Nishant Totla
|
6a250898f4
|
Merge pull request #1790 from vieux/fix_typos
fix 2 typos
|
2016-02-10 13:32:23 -08:00 |
|
Chanwit Kaewkasi
|
bb443b30b3
|
Merge pull request #1787 from arthurbarr/patch-1
Fix typo
|
2016-02-10 20:58:44 +07:00 |
|
Arthur Barr
|
a08742eb72
|
Fix typo
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com>
|
2016-02-10 12:01:45 +00:00 |
|
Victor Vieux
|
220604d6ef
|
fix flacky before tests
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-10 01:52:29 -08:00 |
|
Victor Vieux
|
4d1b023ec2
|
remove coverage from the README since we don't use it anymore
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-10 00:34:24 -08:00 |
|
Victor Vieux
|
5974a4a509
|
replace sleep with retry
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-10 00:28:09 -08:00 |
|
Dong Chen
|
cf2d7b12b1
|
Test reschedule back and forth.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
|
2016-02-10 14:02:46 -08:00 |
|
Victor Vieux
|
208ce7d414
|
fix 2 typos
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-09 22:50:29 -08:00 |
|
Victor Vieux
|
9a43172135
|
add Server Version to docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-09 22:39:53 -08:00 |
|
Alexandre Beslic
|
af74afabbc
|
Merge pull request #1786 from vieux/fix_missing_event_rescheduling
fix missing event on rescheduling
|
2016-02-09 15:33:42 -08:00 |
|
Victor Vieux
|
f7f7f7a99b
|
fix missing event on rescheduling
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-09 14:57:20 -08:00 |
|
Victor Vieux
|
4864b775cb
|
Merge pull request #1784 from nishanttotla/install-machine-typo
Fixing typo in install w machine doc
|
2016-02-09 10:38:01 -08:00 |
|
Nishant Totla
|
95e97d6151
|
Fixing typo in install w machine doc
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
|
2016-02-09 08:54:49 -08:00 |
|
Dongluo Chen
|
3f9a8b6bbe
|
Merge pull request #1774 from abronan/extract_leadership
Extract leadership package and update Godeps
|
2016-02-08 19:54:29 -08:00 |
|
moxiegirl
|
c31ce7475d
|
Merge pull request #1764 from dongluochen/tlsDoc
Update configure-tls.md
|
2016-02-08 18:19:03 -08:00 |
|
moxiegirl
|
62c86799ea
|
Merge pull request #1775 from nishanttotla/fix-swarm-machine
Fixing Swarm Install with Machine doc
|
2016-02-08 18:13:00 -08:00 |
|
Nishant Totla
|
17908da2fd
|
Merge pull request #1776 from vieux/update_travis_1.5.3
update travis to go 1.5.3
|
2016-02-08 18:11:08 -08:00 |
|
Nishant Totla
|
27d9fde0af
|
Fixing Swarm Install with Machine doc
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
|
2016-02-08 18:08:02 -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
|
3f7a035855
|
extract leadership package in its own repository and update Godeps
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
|
2016-02-08 16:55:32 -08:00 |
|
Dong Chen
|
30633d10a0
|
Verify rescheduled containers are started properly.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
|
2016-02-08 15:18:09 -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
|
367acee2b7
|
update travis to go 1.5.3
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-06 11:32:37 -08:00 |
|
Victor Vieux
|
c7eb7ee52f
|
remove build step
Signed-off-by: Victor Vieux <vieux@docker.com>
|
2016-02-06 10:59:17 -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 |
|
Dong Chen
|
e96c222722
|
Update configure-tls.md.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
|
2016-02-05 14:18:36 -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 |
|