Skip to content

Commit 16bef14

Browse files
committed
Add Software Circus
1 parent 8947c6f commit 16bef14

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

conferences.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@
117117
url: https://rootconf.in/2015/
118118
description: Rootconf will help you to plan and develop a strategy map for infrastructure and devops. It will show you the building blocks for reaching a strategy for Infrastructure Scaling, Continuous Integration, Deployment and Delivery.
119119

120+
- name: Software Circus
121+
url: http://softwarecircus.io/
122+
description: An international event on programmable infrastructure.
123+
occurences:
124+
- start_date: 2015-09-10
125+
end_date: 2015-09-11
126+
location: Amsterdam, Denmark
127+
120128
- name: Surge
121129
url: http://surge.omniti.com/2015
122130
description: The Surge Conference is the place where Web Infrastructure and Scalability experts gather, advance and emerge. It is where you can access the people and ideas that matter most to your company and career.

index.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,24 @@ <h3>
264264
<p>Next occurence not yet announced.</p>
265265

266266

267+
<h3>
268+
<a href="http://softwarecircus.io/">Software Circus</a>
269+
</h3>
270+
<p>
271+
An international event on programmable infrastructure.
272+
</p>
273+
274+
<p>
275+
Upcoming on:
276+
<ul>
277+
278+
<li>
279+
2015-09-10 to 2015-09-11 in Amsterdam, Denmark
280+
</li>
281+
282+
</ul>
283+
284+
267285
<h3>
268286
<a href="http://surge.omniti.com/2015">Surge</a>
269287
</h3>

0 commit comments

Comments
 (0)