This is an automated email from the ASF dual-hosted git repository.

pmaheshwari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git


The following commit(s) were added to refs/heads/master by this push:
     new b0c6283  Documentation Update: Added Cavulus to Powered By, added 
recent talk, fixed minor issues.
b0c6283 is described below

commit b0c6283f3ae4acee65efcaecd204aeb804a7f580
Author: Prateek Maheshwari <[email protected]>
AuthorDate: Mon Apr 15 13:48:19 2019 -0700

    Documentation Update: Added Cavulus to Powered By, added recent talk, fixed 
minor issues.
    
    Author: Prateek Maheshwari <[email protected]>
    
    Reviewers: Jagadish Venkatraman <[email protected]>
    
    Closes #994 from prateekm/docs
---
 docs/_meetups/dec-2017.md                    |  2 +-
 docs/_meetups/mar-2019.md                    | 33 ++++++++++++++++++++++++++++
 docs/_meetups/oct-2018.md                    | 27 -----------------------
 docs/_powered-by/{linkedin.md => cavulus.md} | 12 ++++------
 docs/_powered-by/linkedin.md                 |  4 ----
 5 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/docs/_meetups/dec-2017.md b/docs/_meetups/dec-2017.md
index 63ad51f..ee8428b 100644
--- a/docs/_meetups/dec-2017.md
+++ b/docs/_meetups/dec-2017.md
@@ -15,7 +15,7 @@ meetups:
           image: https://img.youtube.com/vi/YDGIDO29Dqk/0.jpg
       slides:
           url: 
https://www.slideshare.net/SamarthShetty2/stream-processing-using-samza-sql
-    abstract: Deep Dive into Samza's SQL library, API and architecture
+      abstract: Deep Dive into Samza's SQL library, API and architecture
     - name: 'Real-time Indexing of LinkedIn’s Economic Graph'
       host: LinkedIn
       image: 
diff --git a/docs/_meetups/mar-2019.md b/docs/_meetups/mar-2019.md
new file mode 100644
index 0000000..4c0259a
--- /dev/null
+++ b/docs/_meetups/mar-2019.md
@@ -0,0 +1,33 @@
+---
+date: March 2019
+display_date: March 2019
+meetups:
+    - name: 'Apache Samza 1.0: Recent advances and our plans for the future'
+      host: LinkedIn
+      image:
+      presenters:
+        - name: Prateek Maheshwari
+          website:
+          image:
+          affiliation: LinkedIn
+      abstract: Apache Samza has reached a major milestone with its recent 1.0 
release. In this talk, we step back and take stock of the major new features 
and enhancements in Samza 1.0. We also take a sneak peek at what's next on our 
roadmap. Both Stream Processing veterans and developers new to Stream 
Processing will discover new features to leverage for their applications.
+      video:
+          url: https://www.youtube.com/watch?v=HBO4KiFqyVU
+          image: https://img.youtube.com/vi/HBO4KiFqyVU/maxresdefault.jpg
+---
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
\ No newline at end of file
diff --git a/docs/_meetups/oct-2018.md b/docs/_meetups/oct-2018.md
index bce763c..78fdab5 100644
--- a/docs/_meetups/oct-2018.md
+++ b/docs/_meetups/oct-2018.md
@@ -2,33 +2,6 @@
 date: Oct 2018
 display_date: Oct 2018
 meetups:
-    - name: 'How LinkedIn navigates Streams Infrastructure using Cruise 
Control?'
-      host: LinkedIn
-      image: 
-      presenters:
-        - name: Efe Gencer
-          website: 
-          image:
-          affiliation: LinkedIn
-      abstract: We’ll share our work and experience in reducing the management 
overhead of large-scale Kafka clusters at LinkedIn using Cruise Control.  
-      video:
-          url: https://www.youtube.com/watch?v=jdo6F21gI8g&feature=youtu.be
-          image: https://img.youtube.com/vi/jdo6F21gI8g/maxresdefault.jpg
-
-    - name: 'Stream Analytics Manager at Uber'
-      host: LinkedIn
-      image: 
-      presenters:
-        - name: Sriharsha Chintalapani 
-          website: 
-          image:
-          affiliation: Uber
-      abstract: Stream Analytics Manager provides a drag and drop UI to build 
complex big data applications. It makes it possible for users to build, deploy 
and monitor their streaming applications. 
-      video:
-          url: https://www.youtube.com/watch?v=ULLE60su5cM&feature=youtu.be
-          image: https://img.youtube.com/vi/ULLE60su5cM/maxresdefault.jpg
-
-
     - name: 'Operating Samza at LinkedIn'
       host: LinkedIn
       image: 
diff --git a/docs/_powered-by/linkedin.md b/docs/_powered-by/cavulus.md
similarity index 65%
copy from docs/_powered-by/linkedin.md
copy to docs/_powered-by/cavulus.md
index 0bd53d6..6647fec 100644
--- a/docs/_powered-by/linkedin.md
+++ b/docs/_powered-by/cavulus.md
@@ -1,11 +1,7 @@
 ---
-name: LinkedIn
-domain: linkedin.com
-<<<<<<< Updated upstream
-priority: 0
-=======
-priority: D
->>>>>>> Stashed changes
+name: Cavulus
+domain: cavulus.com
+priority: 3
 ---
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,4 +20,4 @@ priority: D
    limitations under the License.
 -->
 
-Samza was originally developed at <a class="external-link" 
href="https://linkedin.com/"; rel="nofollow">LinkedIn</a>. It's currently used 
to process tracking data, logs from various services, and for streaming data 
pipelines.
\ No newline at end of file
+<a class="external-link" href="https://www.cavulus.com"; 
rel="nofollow">Cavulus</a> specializes in Medicare Advantage workflow 
automation. We uses Samza + JRuby alongside Kafka as an RPC buffer, all on 
Amazon's Elastic Container Service. These technologies give us high throughput 
and durability guarantees, and together form our processing engine's "central 
nervous system".
\ No newline at end of file
diff --git a/docs/_powered-by/linkedin.md b/docs/_powered-by/linkedin.md
index 0bd53d6..8b5f6ca 100644
--- a/docs/_powered-by/linkedin.md
+++ b/docs/_powered-by/linkedin.md
@@ -1,11 +1,7 @@
 ---
 name: LinkedIn
 domain: linkedin.com
-<<<<<<< Updated upstream
 priority: 0
-=======
-priority: D
->>>>>>> Stashed changes
 ---
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more

Reply via email to