You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ja...@apache.org on 2016/05/27 17:06:45 UTC
[2/4] incubator-beam-site git commit: Resolve merge,2
Resolve merge,2
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/49ae0d94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/49ae0d94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/49ae0d94
Branch: refs/heads/asf-site
Commit: 49ae0d9493fe2f58a2db35c97e781073cc1e15f5
Parents: b61cca9
Author: James Malone <ja...@gmail.com>
Authored: Fri May 27 09:58:43 2016 -0700
Committer: James Malone <ja...@gmail.com>
Committed: Fri May 27 10:03:00 2016 -0700
----------------------------------------------------------------------
content/capability-matrix/index.html | 6 +-----
content/feed.xml | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/49ae0d94/content/capability-matrix/index.html
----------------------------------------------------------------------
diff --git a/content/capability-matrix/index.html b/content/capability-matrix/index.html
index 752e6b8..2d5f7d3 100644
--- 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\u2019ve created the capability matrix below.</p>
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/49ae0d94/content/feed.xml
----------------------------------------------------------------------
diff --git a/content/feed.xml b/content/feed.xml
index 0208117..b85a3e2 100644
--- 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>