github/container.training
1
0
Fork 0
mirror of https://github.com/jpetazzo/container.training.git synced 2026-09-06 03:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,360 Commits 176 Branches 28 Tags
99271a09d3a9b0b862dfd74404b5e97d7f7582c8
Commit Graph
1360 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bridget Kromhout 99271a09d3 Merge pull request #391 from bridgetkromhout/velocityeu2018 
updating ssid/password
 2018-10-30 23:33:24 +01:00
Bridget Kromhout e51f110e9d updating ssid/password 2018-10-30 22:31:58 +00:00
Bridget Kromhout 58936f098f Merge pull request #389 from bridgetkromhout/velocityeu2018 
veleu 2018 updates
 2018-10-30 14:00:51 +01:00
Bridget Kromhout d6f01d5302 veleu 2018 updates 2018-10-30 13:59:20 +01:00
Bridget Kromhout d5d281b627 Merge pull request #388 from bridgetkromhout/velocityeu2018 
vel eu 2018 updates
 2018-10-30 13:45:12 +01:00
Bridget Kromhout 0633f952d4 Merge branch 'velocityeu2018' into velocityeu2018 2018-10-30 13:44:25 +01:00
Bridget Kromhout a93c618154 Update thankyou.md 2018-10-30 13:40:33 +01:00
Bridget Kromhout 4a25c66206 Update logistics-bridget.md 
EU logistics
 2018-10-30 13:36:16 +01:00
Bridget Kromhout 8530dc750f Merge pull request #387 from jpetazzo/velny-k8s101-2018 
bring NY 2018 changes to EU 2018
 2018-10-30 12:32:24 +01:00
Bridget Kromhout 0571b1f3a5 Merge branch 'master' of github.com:jpetazzo/container.training 2018-10-30 12:26:54 +01:00
Jerome Petazzoni c5c1ccaa25 Merge branch 'BretFisher-win-containers-101' 2018-10-29 20:38:21 -05:00
Jerome Petazzoni b68afe502b Minor formatting/typo edits 2018-10-29 20:38:01 -05:00
Jerome Petazzoni d18cacab4c Merge branch 'win-containers-101' of git://github.com/BretFisher/container.training into BretFisher-win-containers-101 2018-10-29 19:59:53 -05:00
Bret Fisher 2faca4a507 docker101 fixing titles 2018-10-30 01:53:31 +01:00
Jerome Petazzoni d797ec62ed Merge branch 'BretFisher-swarm-cicd' 2018-10-29 19:48:59 -05:00
Jerome Petazzoni a475d63789 add CI/CD slides to self-paced deck as well 2018-10-29 19:48:33 -05:00
Jerome Petazzoni dd3f2d054f Merge branch 'swarm-cicd' of git://github.com/BretFisher/container.training into BretFisher-swarm-cicd 2018-10-29 19:46:38 -05:00
Bridget Kromhout 73594fd505 Merge pull request #384 from BretFisher/patch-18 
swarm workshop at goto canceled 😭
 2018-10-26 11:35:53 -05:00
Bret Fisher 16a1b5c6b5 swarm workshop at goto canceled 😭 2018-10-26 07:57:50 +01:00
Bret Fisher ff7a257844 adding cicd to swarm half day 2018-10-26 07:52:32 +01:00
Bret Fisher 77046a8ddf fixed suggestions 2018-10-26 07:51:09 +01:00
Bret Fisher 3ca696f059 size update from docker docs 2018-10-23 16:27:25 +02:00
Bret Fisher 305db76340 more sizing tweaks 2018-10-23 16:27:25 +02:00
Bret Fisher b1672704e8 clear up swarm sizes and manager+worker setups 
Lot's of people will have ~5-10 servers, so let's give them more detailed info.
 2018-10-23 16:27:25 +02:00
Jerome Petazzoni c058f67a1f Add diagram for dockercoins 2018-10-23 16:25:19 +02:00
Alexandre Buisine ab56c63901 switch to an up to date version with latest cloud-init binary and multinic patch 2018-10-23 16:22:56 +02:00
Bret Fisher a5341f9403 Add common Windows/macOS hidden files to gitignore 2018-10-17 19:11:37 +02:00
Laurent Grangeau b2bdac3384 Typo 2018-10-04 18:02:01 +02:00
Bridget Kromhout a2531a0c63 making sure two-day events still show up 
Because we rebuilt today, the two-day events disappeared from the front page. @jpetazzo this is a temporary fix to make them still show up.
 2018-09-30 22:07:03 -04:00
Bridget Kromhout 84e2b90375 Update index.yaml 
adding slides
 2018-09-30 22:05:01 -04:00
Bridget Kromhout 24e7cab2ca Merge pull request #376 from bridgetkromhout/velny-k8s101-2018 
Adding links to thanks slide
 2018-09-30 21:55:17 -04:00
Bridget Kromhout 09a364f554 Adding links to thanks slide 2018-09-30 21:51:58 -04:00
Bridget Kromhout c18d07b06f Merge pull request #375 from bridgetkromhout/velny-k8s101-2018 
Custom thanks slide
 2018-09-30 21:15:09 -04:00
Bridget Kromhout 41cd6ad554 Custom thanks slide 2018-09-30 21:13:27 -04:00
Bridget Kromhout 565db253bf Merge pull request #374 from bridgetkromhout/velny-k8s101-2018 
Velny k8s101 2018 updates
 2018-09-30 20:57:37 -04:00
Bridget Kromhout c46baa0f74 Merge branch 'master' into velny-k8s101-2018 2018-09-30 20:56:17 -04:00
Bridget Kromhout 9639dfb9cc Merge pull request #368 from jpetazzo/kube-ps1 
kube-ps1 is cool and we should mention it
 2018-09-30 20:55:00 -04:00
Bridget Kromhout 8722de6da2 Update namespaces.md 2018-09-30 20:54:31 -04:00
Bridget Kromhout f2f87e52b0 Merge pull request #373 from bridgetkromhout/bridget-links 
Updating Bridget's links
 2018-09-30 20:53:26 -04:00
Bridget Kromhout 56ad2845e7 Updating Bridget's links 2018-09-30 20:52:24 -04:00
Bridget Kromhout cb94697a55 Merge pull request #372 from bridgetkromhout/velny-k8s101-2018 
Velny k8s101 2018
 2018-09-30 20:51:50 -04:00
Bridget Kromhout 74a30db7bd Limiting scope for this event 2018-09-30 20:49:54 -04:00
Bridget Kromhout 336cfbe4dc Merge branch 'master' into velny-k8s101-2018 2018-09-30 20:36:04 -04:00
Bridget Kromhout 86e35480a4 Wording edits 2018-10-01 02:14:50 +02:00
Bridget Kromhout 48a834e85c Merge pull request #369 from bridgetkromhout/velny-k8s101-2018 
Edits for shorter workshop
 2018-09-30 20:11:27 -04:00
Bridget Kromhout 11ca023e45 Edits for shorter workshop 2018-09-30 19:52:47 -04:00
Jerome Petazzoni 1020a8ff86 kube-ps1 is cool and we should mention it 2018-09-30 17:43:18 -05:00
Bridget Kromhout 20b1079a22 Update whatsnext.md 
typo fix
 2018-09-30 16:48:29 -04:00
Bridget Kromhout e2f020b994 Merge pull request #367 from bridgetkromhout/velny-k8s101-2018 
Readability
 2018-09-30 13:40:27 -05:00
Bridget Kromhout 062e8f124a Readability 2018-09-30 14:37:49 -04:00