You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by fr...@apache.org on 2016/10/28 05:12:20 UTC
[1/3] incubator-beam-site git commit: Add downstream merge exemption
to contribution guide
Repository: incubator-beam-site
Updated Branches:
refs/heads/asf-site 71d95e3b2 -> 6f087916f
Add downstream merge exemption to contribution guide
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/caf501b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/caf501b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/caf501b4
Branch: refs/heads/asf-site
Commit: caf501b46baa79bcec49606ac1705f8acb3d707c
Parents: 71d95e3
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Oct 27 18:45:07 2016 -0700
Committer: Frances Perry <fj...@google.com>
Committed: Thu Oct 27 22:10:38 2016 -0700
----------------------------------------------------------------------
contribute/contribution-guide.md | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/caf501b4/contribute/contribution-guide.md
----------------------------------------------------------------------
diff --git a/contribute/contribution-guide.md b/contribute/contribution-guide.md
index e0dd507..88c3884 100644
--- a/contribute/contribution-guide.md
+++ b/contribute/contribution-guide.md
@@ -289,9 +289,18 @@ Some larger features are developed on a feature branch before being merged into
To contribute code on a feature branch, use the same process as above, but replace `master` with the [name of the branch](/contribute/work-in-progress/#feature-branches).
-In additional, you'll want to frequently merge in changes from `master` in order to prevent life on the branch from deviating too far from reality.
-
-Since feature branches are often used for new components, you may find that there is no [committer](/project/team/) familiar with all the details of the new language or runner. In that case, consider asking someone else familiar with the technology to do an initial review before looping in a committer for a final review and merge.
+Since feature branches are often used for new components, you may find that
+there is no [committer](/project/team/) familiar with all the details of the
+new language or runner. In that case, consider asking someone else familiar
+with the technology to do an initial review before looping in a committer for a
+final review and merge.
+
+If you are working on a feature branch, you'll also want to frequently merge in
+changes from `master` in order to prevent life on the branch from deviating too
+far from reality. Like all changes, this should be done via pull request. It
+is permitted for a committer to self-merge such a pull request if there are no
+conflicts or test failures. If there are any conflicts of tests that need
+fixing, then those should get a full review from another committer.
#### Merging into Master
[2/3] incubator-beam-site git commit: Regenerate html
Posted by fr...@apache.org.
Regenerate html
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/38138cfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/38138cfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/38138cfb
Branch: refs/heads/asf-site
Commit: 38138cfb148fa82ff43ae6a38e68cf209bfc8e90
Parents: caf501b
Author: Frances Perry <fj...@google.com>
Authored: Thu Oct 27 22:12:03 2016 -0700
Committer: Frances Perry <fj...@google.com>
Committed: Thu Oct 27 22:12:03 2016 -0700
----------------------------------------------------------------------
content/contribute/contribution-guide/index.html | 15 ++++++++++++---
content/feed.xml | 4 ++--
content/learn/runners/capability-matrix/index.html | 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/38138cfb/content/contribute/contribution-guide/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/contribution-guide/index.html b/content/contribute/contribution-guide/index.html
index bd5516b..a1b1aaa 100644
--- a/content/contribute/contribution-guide/index.html
+++ b/content/contribute/contribution-guide/index.html
@@ -529,9 +529,18 @@ $ git merge --no-ff \
<p>To contribute code on a feature branch, use the same process as above, but replace <code class="highlighter-rouge">master</code> with the <a href="/contribute/work-in-progress/#feature-branches">name of the branch</a>.</p>
-<p>In additional, you\u2019ll want to frequently merge in changes from <code class="highlighter-rouge">master</code> in order to prevent life on the branch from deviating too far from reality.</p>
-
-<p>Since feature branches are often used for new components, you may find that there is no <a href="/project/team/">committer</a> familiar with all the details of the new language or runner. In that case, consider asking someone else familiar with the technology to do an initial review before looping in a committer for a final review and merge.</p>
+<p>Since feature branches are often used for new components, you may find that
+there is no <a href="/project/team/">committer</a> familiar with all the details of the
+new language or runner. In that case, consider asking someone else familiar
+with the technology to do an initial review before looping in a committer for a
+final review and merge.</p>
+
+<p>If you are working on a feature branch, you\u2019ll also want to frequently merge in
+changes from <code class="highlighter-rouge">master</code> in order to prevent life on the branch from deviating too
+far from reality. Like all changes, this should be done via pull request. It
+is permitted for a committer to self-merge such a pull request if there are no
+conflicts or test failures. If there are any conflicts of tests that need
+fixing, then those should get a full review from another committer.</p>
<h4 id="merging-into-master">Merging into Master</h4>
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/38138cfb/content/feed.xml
----------------------------------------------------------------------
diff --git a/content/feed.xml b/content/feed.xml
index f9d1e3c..a774f4e 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>Thu, 27 Oct 2016 21:55:10 -0700</pubDate>
- <lastBuildDate>Thu, 27 Oct 2016 21:55:10 -0700</lastBuildDate>
+ <pubDate>Thu, 27 Oct 2016 22:11:26 -0700</pubDate>
+ <lastBuildDate>Thu, 27 Oct 2016 22:11:26 -0700</lastBuildDate>
<generator>Jekyll v3.2.0</generator>
<item>
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/38138cfb/content/learn/runners/capability-matrix/index.html
----------------------------------------------------------------------
diff --git a/content/learn/runners/capability-matrix/index.html b/content/learn/runners/capability-matrix/index.html
index 4392c91..10c12ba 100644
--- a/content/learn/runners/capability-matrix/index.html
+++ b/content/learn/runners/capability-matrix/index.html
@@ -146,7 +146,7 @@
<div class="row">
<h1 id="beam-capability-matrix">Beam Capability Matrix</h1>
-<p><span style="font-size:11px;float:none">Last updated: 2016-10-27 21:55 PDT</span></p>
+<p><span style="font-size:11px;float:none">Last updated: 2016-10-27 22:11 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>
[3/3] incubator-beam-site git commit: This closes #54.
Posted by fr...@apache.org.
This closes #54.
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/6f087916
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/6f087916
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/6f087916
Branch: refs/heads/asf-site
Commit: 6f087916facdd34c603020580aa1c929545364a4
Parents: 71d95e3 38138cf
Author: Frances Perry <fj...@google.com>
Authored: Thu Oct 27 22:12:35 2016 -0700
Committer: Frances Perry <fj...@google.com>
Committed: Thu Oct 27 22:12:35 2016 -0700
----------------------------------------------------------------------
content/contribute/contribution-guide/index.html | 15 ++++++++++++---
content/feed.xml | 4 ++--
content/learn/runners/capability-matrix/index.html | 2 +-
contribute/contribution-guide.md | 15 ++++++++++++---
4 files changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------