Resolve merge,2

tvalentyn · May 27, 2016 · 49ae0d9 · 49ae0d9
1 parent b61cca9
commit 49ae0d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/content/capability-matrix/index.html b/content/capability-matrix/index.html
@@ -95,11 +95,7 @@
 
       <div class="container">
         <h1 id="apache-beam-capability-matrix">Apache Beam Capability Matrix</h1>
-<<<<<<< 657701378fc1935a67e5b5a5fe1427997b6c9029
-<p><span style="font-size:11px;float:none">Last updated: 2016-05-27 18:38 CEST</span></p>
-=======
-<p><span style="font-size:11px;float:none">Last updated: 2016-05-20 14:42 PDT</span></p>
->>>>>>> Regenerate to post PCollection blog post
+<p><span style="font-size:11px;float:none">Last updated: 2016-05-27 09:58 PDT</span></p>
 
 <p>Apache Beam (incubating) provides a portable API layer for building sophisticated data-parallel processing engines that may be executed across a diversity of exeuction engines, or <i>runners</i>. The core concepts of this layer are based upon the Beam Model (formerly referred to as the <a href="http://www.vldb.org/pvldb/vol8/p1792-Akidau.pdf">Dataflow Model</a>), and implemented to varying degrees in each Beam runner. To help clarify the capabilities of individual runners, we’ve created the capability matrix below.</p>
 

diff --git a/content/feed.xml b/content/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>http://beam.incubator.apache.org/</link>
     <atom:link href="http://beam.incubator.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Fri, 20 May 2016 14:42:30 -0700</pubDate>
-    <lastBuildDate>Fri, 20 May 2016 14:42:30 -0700</lastBuildDate>
+    <pubDate>Fri, 27 May 2016 09:58:31 -0700</pubDate>
+    <lastBuildDate>Fri, 27 May 2016 09:58:31 -0700</lastBuildDate>
     <generator>Jekyll v3.1.3</generator>
 
       <item>