centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,632 Commits 57 Branches 28 Tags
a08742eb7225372cd014ef8952844d32f1eeedd8
Commit Graph

2632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Barr
a08742eb72 Fix typo 
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com>
 2016-02-10 12:01:45 +00: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
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
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