Skip to content

Commit 7c010a2

Browse files
authored
Merge branch 'devopsdays:main' into main
2 parents bf030c9 + 1d54724 commit 7c010a2

12 files changed

Lines changed: 33 additions & 7 deletions

File tree

content/events/2024-amsterdam/program/ig-nathen-harvey.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ The DevOps community has taken lessons and insights from other disciplines.
1414

1515
Many argue that DevOps isn't a tool or a job title.
1616

17-
Let's take some inspiration from another field and explore the idea that, perhaps, DevOps is a Way of Being.
17+
Let's take some inspiration from another field and explore the idea that, perhaps, DevOps is a Way of Being.
18+
19+
[Slides](https://drive.google.com/file/d/1RMLjbT6hZFacKX6uHL7ZKDNrX6TGRSof/view?usp=drive_link)
20+
21+
[Video](https://www.youtube.com/watch?v=eP_wP2SOXbY)

content/events/2024-amsterdam/program/ws-nathen-harvey-amanda-lewis-dave-stanke.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ This workshop will help you put the insights of the research framework into prac
1717
5. Set some goals
1818

1919
By the end of this workshop you will have one improvement story to add to your backlog as you take the next step toward becoming an elite performing team. And, you'll be able to repeat the process with your own team in your quest to get better at getting better!
20+
21+
[Slides](https://drive.google.com/file/d/13Spw4Kq8awgAW1B07I1aRaLgco8GM2Rx/view?usp=drive_link)

content/events/2024-tampa/program.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ Icons = "false"
1313
<i>All times are in US Eastern Time</i>
1414
</div>
1515
</div>
16-
<!-- <script type="text/javascript" src="https://sessionize.com/api/v2/1m3mwqqu/view/GridSmart"></script> -->
16+
<script type="text/javascript" src="https://sessionize.com/api/v2/vqn94s27/view/GridSmart"></script>

content/events/2024-tampa/speakers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Description = "Speakers for devopsdays Tampa Bay 2024"
55
Icons = "false"
66
+++
77

8-
<!-- <script type="text/javascript" src="https://sessionize.com/api/v2/1m3mwqqu/view/SpeakerWall"></script> -->
8+
<script type="text/javascript" src="https://sessionize.com/api/v2/vqn94s27/view/SpeakerWall"></script>

data/events/2024/minneapolis/main.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,14 @@ sponsors:
120120
level: community
121121
- id: datadog
122122
level: gold
123-
123+
- id: spacelift
124+
level: silver
125+
- id: komodor
126+
level: silver
127+
- id: tailscale
128+
level: silver
129+
- id: cirrusnorth
130+
level: alacarte
124131

125132
sponsors_accepted : "yes" # Whether you want "Become a XXX Sponsor!" link
126133

data/events/2024/tampa/main.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ nav_elements: # List of pages you want to show up in the navigation of your page
4141
icon: "map-o"
4242
url: /events/2024-tampa/location
4343
- name: propose
44-
# - name: registration
45-
# - name: program
46-
# - name: speakers
44+
- name: registration
45+
- name: program
46+
- name: speakers
4747
- name: sponsor
4848
- name: contact
4949
- name: conduct
@@ -106,6 +106,13 @@ sponsors:
106106
level: community
107107
- id: dnsimple
108108
level: platinum
109+
- id: dexian
110+
level: gold
111+
- id: harness
112+
level: platinum
113+
- id: coder
114+
level: platinum
115+
109116

110117

111118
# url: http://mysponsor.com/?campaign=me # Use this if you need to over-ride a sponsor URL.

data/sponsors/cirrusnorth.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name: "CirrusNorth"
2+
url: "https://www.cirrusnorth.io"

data/sponsors/coder.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name: "coder"
2+
url: "http://www.coder.com/"

data/sponsors/dexian.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name: "Dexian"
2+
url: "http://www.dexian.com/"
43.9 KB
Loading

0 commit comments

Comments
 (0)