lce14: content

diff --git a/abstract.txt b/abstract.txt
new file mode 100644 (file)
index 0000000..acea249
--- /dev/null
+++ b/abstract.txt
@@ -0,0 +1,15 @@
+Samba is the most important open source SMB file serving software, and
+arguably, one of the most important SMB implementations out there, being
+shipped with all major Linux distributions and part of many big and small
+storage appliances. A lot has happened in Samba's file server in the last
+couple of years, and this talk first describes file serving with Samba in the
+age of Samba 4: Samba 4.0 was released as the Active Directory server release,
+but it was also a very big file server relase with a lot of new changes and new
+features.
+
+With the introduction of SMB version 3, Microsoft moves from pure workstation
+workload focus to server workloads, aiming to partly replace block storage. In
+particular Microsoft catches up with Samba/CTDB to offer all-active clustering.
+The second part of this talk describes current work in progress in this area
+and where the Samba file server is heading.
+

diff --git a/base-wiki.wiki b/base-wiki.wiki
index deaa6a925b2cbd40d8cd81e1484ec128c0ef9474..a213d8bff573375142e02bc7a13e17cd0943f19b 100644 (file)
--- a/base-wiki.wiki
+++ b/base-wiki.wiki
@@ -225,7 +225,7 @@ Reduction of CPU usage for low profile platforms like arm (SMB2)
 [center]>
 
 
-==== Interop - Apple  ====
+==== Interop - Fruit ====
 
 
 <[columns]
@@ -251,6 +251,13 @@ Reduction of CPU usage for low profile platforms like arm (SMB2)
 <<<apfel_1280.jpg,width=.9\textwidth>>>
 [columns]>
 
+==== ====[plain]
+
+<[center]
+\Large
+Fruit Demo
+[center]>
+
 ==== SMB features ====[plain]
 
 %\transdissolve
@@ -425,6 +432,13 @@ Reduction of CPU usage for low profile platforms like arm (SMB2)
 * implement interface discovery [WIP]
 }
 
+==== ====[plain]
+
+<[center]
+\Large
+Multi-Channel Demo
+[center]>
+
 ==== SMB Direct (RDMA) ====
 
 +<2->{
@@ -758,9 +772,9 @@ Reduction of CPU usage for low profile platforms like arm (SMB2)
 [block]>
 
 
-==== ====[plain]
+==== Thanks for your attention! ====[plain]
 
-\transdissolve
+%\transdissolve
 
 <[center]
 <[columns]

diff --git a/durable-crop-colormod-1024.jpg b/durable-crop-colormod-1024.jpg
new file mode 100644 (file)
index 0000000..39e617d
Binary files /dev/null and b/durable-crop-colormod-1024.jpg differ