docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
49,460 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

1443 Commits

Author SHA1 Message Date
Justin I. Nevill af40416cb8
Merge pull request #694 from docker/node-activate-673 
CE-EE Node Activate
 2018-10-24 11:29:56 -04:00
Anne Henmi 32d060a1f3
Update ce-ee-node-activate.md 2018-10-24 09:27:56 -06:00
Anne Henmi d9599eb932
Update ce-ee-node-activate.md 2018-10-24 09:22:39 -06:00
Anne Henmi 02690e50ca
Update ce-ee-node-activate.md 2018-10-24 09:20:04 -06:00
Anne Henmi b50b063a67
Update ce-ee-node-activate.md 2018-10-22 11:25:41 -06:00
Anne Henmi 8a86c77bfd
Update ce-ee-node-activate.md 
Incorporated @bermudezmt's fixes.
 2018-10-22 08:45:34 -06:00
Anne Henmi 28fbdab78c
Update ce-ee-node-activate.md 
Fixed --license output per @davidwilliamson and fixed root prompts (changed to $).
 2018-10-16 10:21:44 -06:00
Anne Henmi c3efcdd0a4
Update ce-ee-node-activate.md 
Removed Red Hat Linux per @andrewhsu
 2018-10-16 10:19:40 -06:00
Anne Henmi 69aa7d395d
Update join-nodes.md 
Incorporated @JustinINevill's feedback.
 2018-10-16 08:55:58 -06:00
Anne Henmi fc9fdb01ac
Update join-nodes.md 
Added in @andrewhsu's feedback.
 2018-10-15 15:07:45 -06:00
Anne Henmi 7de1b2033e
Update join-nodes.md 
Added beta tag.
 2018-10-10 10:49:01 -06:00
Anne Henmi 03e3c4dd51
Update join-nodes.md 2018-10-10 10:43:49 -06:00
Anne Henmi 432984c74d
Update join-nodes.md 2018-10-10 10:43:02 -06:00
Anne Henmi 0d321f68af Renamed cc-ee-node-activation.md to ce-ee-node-activate.md. This removes the original filename. 2018-10-08 10:22:16 -06:00
Anne Henmi bb096624bf renamed file after recognizing typo. 2018-10-08 10:20:07 -06:00
Anne Henmi 82150f2d97 Merge branch 'node-activate-673' of github.com:docker/docs-private into node-activate-673 2018-10-05 16:52:36 -06:00
Anne Henmi 577d2b4d03 Added TOC entry and beta disclaimer. 2018-10-05 16:52:06 -06:00
Anne Henmi 2f0cc38dd5
Update cc-ee-node-activation.md 
Resolves https://github.com/docker/docker-core-backlog/issues/370
 2018-10-05 12:32:03 -06:00
Anne Henmi 27446f1fba
Update join-nodes.md 
Fixed @justincormack's clarification on running a mixed-FIPS environment.
 2018-10-04 19:29:09 -06:00
Anne Henmi b1c961d8a3 Added content for https://github.com/docker/docker-core-backlog/issues/374 2018-10-04 19:10:10 -06:00
Anne Henmi f79529bfe5 Incorporated information from https://github.com/docker/docker-core-backlog/issues/396 and https://github.com/docker/docker-core-backlog/issues/432. 2018-10-04 15:31:33 -06:00
Anne Henmi 73bc8269f5 Update cc-ee-node-activation.md 2018-10-04 11:02:33 -06:00
Anne Henmi b33fc8d69c Update cc-ee-node-activation.md 2018-10-04 11:02:33 -06:00
Anne Henmi 1d1d9f59a9 Update cc-ee-node-activation.md 2018-10-04 11:02:33 -06:00
Anne Henmi 29121ec5dc Update cc-ee-node-activation.md 
Fixed per discussion from P team and @JustinINevill in Slack.
 2018-10-04 11:02:33 -06:00
Anne Henmi 67845656a3 resolve merge conflict 2018-10-04 10:59:04 -06:00
Anne Henmi 7d80bd0202 Included updates from https://github.com/docker/docker-core-backlog/issues/375. 2018-10-03 14:03:10 -06:00
Anne Henmi f4576b44fa
Update swarm-mode.md 
fixed typo
 2018-09-19 07:56:03 -06:00
Anne Henmi 5ab93890e5
Update swarm-mode.md 
Incorporated @selansen's feedback
 2018-09-18 21:10:54 -06:00
Anne Henmi 329498653f
Update networking.md 
Incorporated @bermudezmt's feedback
 2018-09-18 21:09:47 -06:00
Anne Henmi 8f465b4a01
Merge branch 'master' into swarm-default-network-670 2018-09-14 14:24:05 -06:00
Anne Henmi 783cc9fb4a
Update networking.md 
Incorporated Maria's feedback.
 2018-09-12 18:12:57 -06:00
Anne Henmi 3695cd0b74
Update swarm-mode.md 
Cleaned up Mark's additions
 2018-09-12 13:30:41 -06:00
Anne Henmi 3bae1bb428
Update networking.md 
Cleaned up Mark's additions.
 2018-09-12 13:26:00 -06:00
Maria Bermudez 0cbcdb3777 Re-add swarm mode page 2018-09-10 14:56:59 -07:00
Mark Church ea9e729e21 added default address pools installation/usage comments across UCP install, swarm install, and networking pages 2018-09-08 14:02:42 -07:00
Maria Bermudez 30390528f6
Delete swarm-mode.md 
Remove file from kubernetes branch.
 2018-09-04 11:26:03 -07:00
Maria Bermudez 016bcb74c9
Delete cc-ee-node-activation.md 
Remove file from kubernetes branch
 2018-09-04 11:25:40 -07:00
Maria Bermudez 48ab28e3d3
Delete cc-ee-node-activation.md 
File incorrectly added to the wrong branch.
 2018-09-04 08:31:28 -07:00
Maria Bermudez 4320c439c1
Update swarm-mode.md 
Incorporate changes made in kube-net-encryption branch.
 2018-09-04 08:30:55 -07:00
Anne Henmi 664dc1726e
Update swarm-mode.md 2018-09-04 08:54:52 -06:00
Anne Henmi 599f5bba6d
Update cc-ee-node-activation.md 2018-09-04 08:51:38 -06:00
David Deyo fc6ce901f9
Update cc-ee-node-activation.md 2018-08-31 10:43:04 -07:00
Anne Henmi 6b5469b855 Created content for Issue 670. Ready for review. 2018-08-30 13:47:38 -06:00
Anne Henmi 536c65d4fb Created Issue 673. Ready for review. 2018-08-30 13:27:39 -06:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 4c95d161ca.
 2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 14080c18bd.
 2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 14:47:31 -07:00
Tammy Fox 1c1b1c092b
Merge pull request #6997 from scjane/patch-102 
Update userns-remap.md
 2018-08-06 15:56:37 -04:00