summaryrefslogtreecommitdiffstats
path: root/docs/events/Conferences
diff options
context:
space:
mode:
Diffstat (limited to 'docs/events/Conferences')
-rw-r--r--docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst22
-rw-r--r--docs/events/Conferences/CiscoLiveUS/index.rst12
-rw-r--r--docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst22
-rw-r--r--docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst22
-rw-r--r--docs/events/Conferences/Linuxcon/index.rst13
-rw-r--r--docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst22
-rw-r--r--docs/events/Conferences/OSCON/index.rst13
7 files changed, 126 insertions, 0 deletions
diff --git a/docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst b/docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
new file mode 100644
index 00000000000..fa72e387379
--- /dev/null
+++ b/docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
@@ -0,0 +1,22 @@
+.. _2017_06_26_vppcontainernetwork:
+
+.. toctree::
+
+#########################################
+VPP and container networking at 110Gbps
+#########################################
+
+Event
+-----
+
+This presentation was held on June 26th, 2017.
+
+Speakers
+--------
+
+Keith Burns
+
+Slideshow
+---------
+
+`Powerpoint Presentation <https://wiki.fd.io/images/7/7b/Cisco_Live_VPP_and_container_networking_%28BRKSDN-2119%29.pptx>`_
diff --git a/docs/events/Conferences/CiscoLiveUS/index.rst b/docs/events/Conferences/CiscoLiveUS/index.rst
new file mode 100644
index 00000000000..14ebbac30c0
--- /dev/null
+++ b/docs/events/Conferences/CiscoLiveUS/index.rst
@@ -0,0 +1,12 @@
+.. _CiscoLiveUS:
+
+.. toctree::
+
+#########################
+June 2017 - Cisco Live US
+#########################
+
+.. toctree::
+ :maxdepth: 1
+
+ 2017_06_26_vppcontainernetwork.rst
diff --git a/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst b/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst
new file mode 100644
index 00000000000..35d851852a1
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst
@@ -0,0 +1,22 @@
+.. _2016_08_24_introfdio:
+
+.. toctree::
+
+##############
+Intro to FD.io
+##############
+
+Event
+-----
+
+This presentation was held on August 24th, 2016.
+
+Speakers
+--------
+
+Ed Warnicke
+
+Presentation
+-------------
+
+`Powerpoint <https://wiki.fd.io/images/8/87/Fd.io_intro_-_Linuxcon_NA_2016.pptx>`_
diff --git a/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst b/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst
new file mode 100644
index 00000000000..a3202a4ad0d
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst
@@ -0,0 +1,22 @@
+.. _2016_08_24_onelispintro:
+
+.. toctree::
+
+###############
+ONE-LISP Intro
+###############
+
+Event
+-----
+
+This presentation was held on August 24th, 2016.
+
+Speakers
+--------
+
+Florin Coras
+
+Presentation
+------------
+
+`Powerpoint <https://wiki.fd.io/images/3/3e/ONE-LISP_-_Linuxcon_NA_2016.pptx>`_
diff --git a/docs/events/Conferences/Linuxcon/index.rst b/docs/events/Conferences/Linuxcon/index.rst
new file mode 100644
index 00000000000..d166ca89b19
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/index.rst
@@ -0,0 +1,13 @@
+.. _Linuxcon:
+
+.. toctree::
+
+##############################
+August 2017 - Linuxcon NA 2016
+##############################
+
+.. toctree::
+ :maxdepth: 1
+
+ 2016_08_24_introfdio
+ 2016_08_24_onelispintro \ No newline at end of file
diff --git a/docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst b/docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst
new file mode 100644
index 00000000000..13f0058cfd2
--- /dev/null
+++ b/docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst
@@ -0,0 +1,22 @@
+.. _2017_05_11_40gbpsipsec:
+
+.. toctree::
+
+##################################
+40Gbps IPsec on commodity hardware
+##################################
+
+Event
+-----
+
+This presentation was held on May 11th, 2017.
+
+Speakers
+--------
+
+Jim Thompson
+
+Slideshow
+---------
+
+`PDF <https://wiki.fd.io/images/1/1d/40_Gbps_IPsec_on_commodity_hardware.pdf>`_
diff --git a/docs/events/Conferences/OSCON/index.rst b/docs/events/Conferences/OSCON/index.rst
new file mode 100644
index 00000000000..a3a9cdbc6b4
--- /dev/null
+++ b/docs/events/Conferences/OSCON/index.rst
@@ -0,0 +1,13 @@
+.. _OSCON:
+
+.. toctree::
+
+################
+May 2017 - OSCON
+################
+
+.. toctree::
+ :maxdepth: 1
+
+ 2017_05_11_40gbpsipsec.rst
+ \ No newline at end of file