You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by me...@apache.org on 2018/05/15 04:49:14 UTC
[beam-site] branch mergebot updated (4605bf7 -> 21a7749)
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a change to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git.
from 4605bf7 This closes #410
add ae67bad Prepare repository for deployment.
add bef6e32 Add top-level Community section
add 712fd02 Remove obsolete Maturity Model section
add 94ceaae Regenerate site content
add 7a34444 Merge #436: Add Community top-level section
new 67b9a07 Move Release Guide to committers section
new 333740a Move committer section to the bottom (we can find it :-)
new a4f2e5c Streamline the contribution section
new 4284b6a Google has scrapped research, now only AI
new 25a50fe Temporarily suppress validation of ai.google links
new 21a7749 This closes #438
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Rakefile | 6 +-
.../capability/2016/03/17/capability-matrix.html | 3 +
.../2016/04/03/presentation-materials.html | 3 +
.../sdk/2016/02/25/python-sdk-now-public.html | 3 +
content/beam/release/2016/06/15/first-release.html | 3 +
.../2016/10/11/strata-hadoop-world-and-beam.html | 3 +
.../update/website/2016/02/22/beam-has-a-logo.html | 3 +
.../blog/2016/05/18/splitAtFraction-method.html | 3 +
.../05/27/where-is-my-pcollection-dot-map.html | 3 +
.../2016/06/13/flink-batch-runner-milestone.html | 3 +
content/blog/2016/08/03/six-months.html | 3 +
content/blog/2016/10/20/test-stream.html | 3 +
content/blog/2017/01/09/added-apex-runner.html | 3 +
content/blog/2017/01/10/beam-graduates.html | 3 +
.../blog/2017/02/01/graduation-media-recap.html | 3 +
content/blog/2017/02/13/stateful-processing.html | 3 +
content/blog/2017/03/16/python-sdk-release.html | 3 +
.../blog/2017/05/17/beam-first-stable-release.html | 3 +
content/blog/2017/08/16/splittable-do-fn.html | 3 +
content/blog/2017/08/28/timely-processing.html | 3 +
content/blog/2018/01/09/beam-a-look-back.html | 3 +
content/blog/2018/02/19/beam-2.3.0.html | 3 +
content/blog/index.html | 3 +
content/coming-soon.html | 3 +
.../contact-us}/index.html | 88 +-
content/{contribute => community}/logos/index.html | 67 +-
.../presentation-materials/index.html | 67 +-
content/contribute/become-a-committer/index.html | 15 +-
content/contribute/committer-guide/index.html | 15 +-
content/contribute/contribution-guide/index.html | 15 +-
content/contribute/design-principles/index.html | 15 +-
content/contribute/docker-images/index.html | 15 +-
content/contribute/eclipse/index.html | 15 +-
content/contribute/feature-branches/index.html | 15 +-
content/contribute/index.html | 15 +-
content/contribute/intellij/index.html | 15 +-
content/contribute/logos/index.html | 537 +-
content/contribute/maturity-model/index.html | 6894 --------------------
content/contribute/portability/index.html | 15 +-
.../contribute/presentation-materials/index.html | 253 +-
.../contribute/ptransform-style-guide/index.html | 15 +-
content/contribute/release-guide/index.html | 15 +-
content/contribute/runner-guide/index.html | 15 +-
content/contribute/source-repository/index.html | 15 +-
content/contribute/testing/index.html | 15 +-
.../contribute/website-contributions/index.html | 15 +-
content/contribute/work-in-progress/index.html | 15 +-
content/documentation/dsls/sql/index.html | 4 +
content/documentation/execution-model/index.html | 3 +
content/documentation/index.html | 3 +
content/documentation/io/authoring-java/index.html | 3 +
.../documentation/io/authoring-overview/index.html | 3 +
.../documentation/io/authoring-python/index.html | 3 +
.../documentation/io/built-in/hadoop/index.html | 3 +
content/documentation/io/built-in/index.html | 3 +
content/documentation/io/contributing/index.html | 3 +
content/documentation/io/io-toc/index.html | 3 +
content/documentation/io/testing/index.html | 3 +
.../pipelines/create-your-pipeline/index.html | 3 +
.../pipelines/design-your-pipeline/index.html | 3 +
.../pipelines/test-your-pipeline/index.html | 3 +
content/documentation/programming-guide/index.html | 150 +-
content/documentation/resources/index.html | 3 +
content/documentation/runners/apex/index.html | 3 +
.../runners/capability-matrix/index.html | 3 +
content/documentation/runners/dataflow/index.html | 103 +-
content/documentation/runners/direct/index.html | 21 +-
content/documentation/runners/flink/index.html | 3 +
content/documentation/runners/gearpump/index.html | 3 +
content/documentation/runners/jstorm/index.html | 3 +
content/documentation/runners/mapreduce/index.html | 3 +
content/documentation/runners/spark/index.html | 3 +
.../sdks/feature-comparison/index.html | 4 +
.../documentation/sdks/java-extensions/index.html | 4 +
.../documentation/sdks/java-thirdparty/index.html | 4 +
content/documentation/sdks/java/index.html | 4 +
content/documentation/sdks/java/nexmark/index.html | 4 +
.../documentation/sdks/python-custom-io/index.html | 4 +
.../sdks/python-pipeline-dependencies/index.html | 4 +
.../index.html | 260 +-
.../sdks/python-type-safety/index.html | 4 +
content/documentation/sdks/python/index.html | 33 +-
content/get-started/beam-overview/index.html | 4 +-
content/get-started/downloads/index.html | 4 +-
content/get-started/index.html | 4 +-
.../get-started/mobile-gaming-example/index.html | 4 +-
content/get-started/quickstart-java/index.html | 12 +-
content/get-started/quickstart-py/index.html | 63 +-
content/get-started/support/index.html | 255 +-
content/get-started/wordcount-example/index.html | 306 +-
content/index.html | 3 +
content/learn/presentation-materials/index.html | 8 +-
content/material/index.html | 8 +-
content/privacy_policy/index.html | 3 +
content/project/logos/index.html | 8 +-
content/use/issue-tracking/index.html | 8 +-
content/use/mailing-lists/index.html | 8 +-
src/_includes/header.html | 3 +
src/_includes/section-menu/community.html | 14 +
src/_includes/section-menu/contribute.html | 42 +-
src/_includes/section-menu/get-started.html | 1 -
.../2016-05-20-where-is-my-pcollection-dot-map.md | 5 +-
src/community/contact-us.md | 26 +
src/{contribute => community}/logos.md | 5 +-
.../presentation-materials.md | 8 +-
src/contribute/contribution-guide.md | 387 --
src/contribute/design-principles.md | 53 -
src/contribute/eclipse.md | 18 +-
src/contribute/index.md | 187 +-
src/contribute/maturity-model.md | 6666 -------------------
src/contribute/source-repository.md | 29 -
src/contribute/work-in-progress.md | 33 -
src/get-started/quickstart-java.md | 4 +-
src/get-started/quickstart-py.md | 4 +-
src/get-started/support.md | 75 -
115 files changed, 1214 insertions(+), 15946 deletions(-)
copy content/{documentation/sdks/feature-comparison => community/contact-us}/index.html (77%)
copy content/{contribute => community}/logos/index.html (88%)
copy content/{contribute => community}/presentation-materials/index.html (83%)
delete mode 100644 content/contribute/maturity-model/index.html
copy content/documentation/sdks/{java-thirdparty => python-streaming}/index.html (53%)
create mode 100644 src/_includes/section-menu/community.html
create mode 100644 src/community/contact-us.md
rename src/{contribute => community}/logos.md (95%)
rename src/{contribute => community}/presentation-materials.md (93%)
delete mode 100644 src/contribute/contribution-guide.md
delete mode 100644 src/contribute/design-principles.md
delete mode 100644 src/contribute/maturity-model.md
delete mode 100644 src/contribute/source-repository.md
delete mode 100644 src/contribute/work-in-progress.md
delete mode 100644 src/get-started/support.md
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.
[beam-site] 02/06: Move committer section to the bottom (we can
find it :-)
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 333740a484a9581d6bec36b539deea1159d91d1b
Author: Kenneth Knowles <kl...@google.com>
AuthorDate: Fri May 11 14:48:52 2018 -0700
Move committer section to the bottom (we can find it :-)
---
src/_includes/section-menu/contribute.html | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/_includes/section-menu/contribute.html b/src/_includes/section-menu/contribute.html
index bf74612..a9bea28 100644
--- a/src/_includes/section-menu/contribute.html
+++ b/src/_includes/section-menu/contribute.html
@@ -10,15 +10,6 @@
</ul>
</li>
<li>
- <span class="section-nav-list-title">Committers</span>
-
- <ul class="section-nav-list">
- <li><a href="{{ site.baseurl }}/contribute/become-a-committer/">Become a committer</a></li>
- <li><a href="{{ site.baseurl }}/contribute/committer-guide/">Committer guide</a></li>
- <li><a href="{{ site.baseurl }}/contribute/release-guide/">Release guide</a></li>
- </ul>
-</li>
-<li>
<span class="section-nav-list-title">IDE tips</span>
<ul class="section-nav-list">
@@ -46,3 +37,12 @@
<li><a href="{{ site.baseurl }}/contribute/docker-images/">Docker images</a></li>
</ul>
</li>
+<li>
+ <span class="section-nav-list-title">Committers</span>
+
+ <ul class="section-nav-list">
+ <li><a href="{{ site.baseurl }}/contribute/become-a-committer/">Become a committer</a></li>
+ <li><a href="{{ site.baseurl }}/contribute/committer-guide/">Committer guide</a></li>
+ <li><a href="{{ site.baseurl }}/contribute/release-guide/">Release guide</a></li>
+ </ul>
+</li>
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.
[beam-site] 04/06: Google has scrapped research, now only AI
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 4284b6af60b5fd82c960c6593051bdb4d39a1505
Author: Kenneth Knowles <kl...@google.com>
AuthorDate: Sat May 12 20:02:49 2018 -0700
Google has scrapped research, now only AI
---
src/_posts/2016-05-20-where-is-my-pcollection-dot-map.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/_posts/2016-05-20-where-is-my-pcollection-dot-map.md b/src/_posts/2016-05-20-where-is-my-pcollection-dot-map.md
index 5fc13f0..f4d431a 100644
--- a/src/_posts/2016-05-20-where-is-my-pcollection-dot-map.md
+++ b/src/_posts/2016-05-20-where-is-my-pcollection-dot-map.md
@@ -11,7 +11,10 @@ Have you ever wondered why Beam has PTransforms for everything instead of having
<!--more-->
-Though Beam is relatively new, its design draws heavily on many years of experience with real-world pipelines. One of the primary inspirations is [FlumeJava](http://research.google.com/pubs/pub35650.html), which is Google's internal successor to MapReduce first introduced in 2009.
+Though Beam is relatively new, its design draws heavily on many years of
+experience with real-world pipelines. One of the primary inspirations is
+[FlumeJava](https://ai.google/research/pubs/pub35650), which is Google's
+internal successor to MapReduce first introduced in 2009.
The original FlumeJava API has methods like `count` and `parallelDo` on the PCollections. Though slightly more succinct, this approach has many disadvantages to extensibility. Every new user to FlumeJava wanted to add transforms, and adding them as methods to PCollection simply doesn't scale well. In contrast, a PCollection in Beam has a single `apply` method which takes any PTransform as an argument.
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.
[beam-site] 05/06: Temporarily suppress validation of ai.google
links
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 25a50fe5537c56e1a58fdfe24ce274266fe2519f
Author: Kenneth Knowles <kl...@google.com>
AuthorDate: Mon May 14 15:17:50 2018 -0700
Temporarily suppress validation of ai.google links
---
Rakefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Rakefile b/Rakefile
index 3398fe9..c2e7069 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,7 +12,11 @@ task :test do
:allow_hash_href => true,
:check_html => true,
:file_ignore => [/javadoc/, /v2/, /pydoc/],
- :url_ignore => [/jstorm.io/, /datatorrent.com/],
+ :url_ignore => [
+ /jstorm.io/,
+ /datatorrent.com/,
+ /ai.google/ # https://issues.apache.org/jira/browse/INFRA-16527
+ ],
:parallel => { :in_processes => Etc.nprocessors },
}).run
end
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.
[beam-site] 06/06: This closes #438
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 21a7749f8a4d0633a4860fa722d06791e8740228
Merge: 7a34444 25a50fe
Author: Mergebot <me...@apache.org>
AuthorDate: Mon May 14 21:48:47 2018 -0700
This closes #438
Rakefile | 6 +-
src/_includes/section-menu/contribute.html | 34 +-
.../2016-05-20-where-is-my-pcollection-dot-map.md | 5 +-
src/contribute/contribution-guide.md | 387 ---------------------
src/contribute/design-principles.md | 53 ---
src/contribute/eclipse.md | 18 +-
src/contribute/index.md | 187 +++++++++-
src/contribute/source-repository.md | 29 --
src/contribute/work-in-progress.md | 33 --
9 files changed, 195 insertions(+), 557 deletions(-)
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.
[beam-site] 01/06: Move Release Guide to committers section
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit 67b9a07da07c4e0f256c4441baa68ea3efe8e409
Author: Kenneth Knowles <kl...@google.com>
AuthorDate: Fri May 11 14:47:07 2018 -0700
Move Release Guide to committers section
---
src/_includes/section-menu/contribute.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/_includes/section-menu/contribute.html b/src/_includes/section-menu/contribute.html
index e07f004..bf74612 100644
--- a/src/_includes/section-menu/contribute.html
+++ b/src/_includes/section-menu/contribute.html
@@ -15,6 +15,7 @@
<ul class="section-nav-list">
<li><a href="{{ site.baseurl }}/contribute/become-a-committer/">Become a committer</a></li>
<li><a href="{{ site.baseurl }}/contribute/committer-guide/">Committer guide</a></li>
+ <li><a href="{{ site.baseurl }}/contribute/release-guide/">Release guide</a></li>
</ul>
</li>
<li>
@@ -30,7 +31,6 @@
<ul class="section-nav-list">
<li><a href="{{ site.baseurl }}/contribute/testing/">Testing guide</a></li>
- <li><a href="{{ site.baseurl }}/contribute/release-guide/">Release guide</a></li>
<li><a href="{{ site.baseurl }}/contribute/ptransform-style-guide/">PTransform style guide</a></li>
<li><a href="{{ site.baseurl }}/contribute/runner-guide/">Runner authoring guide</a></li>
</ul>
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.
[beam-site] 03/06: Streamline the contribution section
Posted by me...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch mergebot
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit a4f2e5cad54e5787e2796bf9df091ac0adb56f74
Author: Kenneth Knowles <kl...@google.com>
AuthorDate: Fri May 11 15:53:15 2018 -0700
Streamline the contribution section
---
src/_includes/section-menu/contribute.html | 22 +-
src/contribute/contribution-guide.md | 387 -----------------------------
src/contribute/design-principles.md | 53 ----
src/contribute/eclipse.md | 18 +-
src/contribute/index.md | 187 ++++++++++++--
src/contribute/source-repository.md | 29 ---
src/contribute/work-in-progress.md | 33 ---
7 files changed, 180 insertions(+), 549 deletions(-)
diff --git a/src/_includes/section-menu/contribute.html b/src/_includes/section-menu/contribute.html
index a9bea28..b1836c7 100644
--- a/src/_includes/section-menu/contribute.html
+++ b/src/_includes/section-menu/contribute.html
@@ -1,14 +1,5 @@
<li><span class="section-nav-list-main-title">Contribute</span></li>
-<li><a href="{{ site.baseurl }}/contribute">Get started contributing</a></li>
-<li>
- <span class="section-nav-list-title">How to contribute</span>
-
- <ul class="section-nav-list">
- <li><a href="{{ site.baseurl }}/contribute/contribution-guide/">Contribution guide</a></li>
- <li><a href="{{ site.baseurl }}/contribute/website-contributions/">Website contributions</a></li>
- <li><a href="{{ site.baseurl }}/contribute/feature-branches/">Feature branches</a></li>
- </ul>
-</li>
+<li><a href="{{ site.baseurl }}/contribute/">Get started contributing</a></li>
<li>
<span class="section-nav-list-title">IDE tips</span>
@@ -18,22 +9,13 @@
</ul>
</li>
<li>
- <span class="section-nav-list-title">Other Guides</span>
+ <span class="section-nav-list-title">Technical Docs</span>
<ul class="section-nav-list">
<li><a href="{{ site.baseurl }}/contribute/testing/">Testing guide</a></li>
<li><a href="{{ site.baseurl }}/contribute/ptransform-style-guide/">PTransform style guide</a></li>
<li><a href="{{ site.baseurl }}/contribute/runner-guide/">Runner authoring guide</a></li>
- </ul>
-</li>
-<li>
- <span class="section-nav-list-title">Technical References</span>
-
- <ul class="section-nav-list">
- <li><a href="{{ site.baseurl }}/contribute/design-principles/">Design principles</a></li>
<li><a href="{{ site.baseurl }}/contribute/portability/">Portability Framework</a></li>
- <li><a href="{{ site.baseurl }}/contribute/work-in-progress/">Ongoing projects</a></li>
- <li><a href="{{ site.baseurl }}/contribute/source-repository/">Source repository</a></li>
<li><a href="{{ site.baseurl }}/contribute/docker-images/">Docker images</a></li>
</ul>
</li>
diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md
deleted file mode 100644
index fa08ba7..0000000
--- a/src/contribute/contribution-guide.md
+++ /dev/null
@@ -1,387 +0,0 @@
----
-layout: section
-title: "Beam Contribution Guide"
-permalink: /contribute/contribution-guide/
-section_menu: section-menu/contribute.html
-redirect_from: /contribution-guide/
----
-
-# Apache Beam Contribution Guide
-
-The Apache Beam community welcomes contributions from anyone!
-
-There are lots of opportunities:
-
- - write new examples
- - improve the documentation
- - add new user-facing libraries (new statistical libraries, new IO connectors,
- etc)
- - improve your favorite language SDK (Java, Python, Go, etc)
- - improve specific runners (Apache Apex, Apache Flink, Apache Spark, Google
- Cloud Dataflow, etc)
- - work on the core programming model (what is a Beam pipeline and how does it
- run?)
-
-Most importantly, if you have an idea of how to contribute, then do it!
-
-For a list of open starter tasks, check
-[https://s.apache.org/beam-starter-tasks](https://s.apache.org/beam-starter-tasks).
-
-What follows is a more comprehensive document covering details of things that
-may come up.
-
-## Review-then-commit workflow
-
-We use a review-then-commit workflow in Beam.
-
-![The Beam contribution workflow has 5 steps: engage, design, code, review, and commit.](
- {{ "/images/contribution-guide-1.png" | prepend: site.baseurl }})
-
-**For larger contributions or those that affect multiple components:**
-
-1. **Engage**: We encourage you to work with the Beam community on the [Apache
- JIRA issue tracker](https://issues.apache.org/jira/browse/BEAM) and
- [developer’s mailing list]({{ site.baseurl }}/get-started/support/) to identify
- good areas for contribution.
-2. **Design:** More complicated contributions will likely benefit from some
- early discussion in order to scope and design them well.
-
-**For all contributions:**
-
-1. **Code:** The best part ;-)
-2. **Review:** Submit a pull request with your contribution to our [GitHub
- mirror](https://github.com/apache/beam/). Work with a committer to review
-and iterate on the code, if needed.
-3. **Commit:** A Beam committer merges the pull request into our [Apache
- repository](https://gitbox.apache.org/repos/asf/beam.git).
-
-We look forward to working with you!
-
-## Engage
-
-### Mailing list(s)
-
-We discuss design and implementation issues on the `dev@beam.apache.org`
-mailing list, which is archived
-[here](https://lists.apache.org/list.html?dev@beam.apache.org). Join by
-emailing
-[`dev-subscribe@beam.apache.org`](mailto:dev-subscribe@beam.apache.org).
-Anyone is welcome to join, and we'd love to hear what you're interested in.
-
-If interested, you can also join the other [mailing lists]({{ site.baseurl
-}}/get-started/support/).
-
-### JIRA issue tracker
-
-We use the Apache Software Foundation's
-[JIRA](https://issues.apache.org/jira/browse/BEAM) as an issue tracking and
-project management tool.
-
-If you do not already have an Apache JIRA account, sign up
-[here](https://issues.apache.org/jira/).
-
-If a quick
-[search](https://issues.apache.org/jira/issues/?jql=project%3DBEAM%20AND%20text%20~%20%22the%20thing%20I%20want%20to%20contribute%22)
-doesn’t turn up an existing JIRA issue for the work you want to contribute,
-feel free to create one.
-
-If there’s an existing JIRA issue for your intended contribution, please
-comment about your intended work. A committer can
-assign the issue to you. (If you don’t have a JIRA role yet, you’ll be added to
-the “contributor” role.) If an issue is currently assigned, it is generally
-good practice to at least reach out the current assignee before reassigning.
-
-For moderate or large contributions, we recommend engaging on the developer
-mailing list before investing significant effort to gather feedback,
-avoid frustration, and prevent duplicated work.
-Simple changes, like fixing typos, do not nead JIRA entries
-and are welcome via direct pull requests.
-
-### Online discussions
-
-We don't have an official IRC channel. Most of the online discussions happen in
-the [Apache Beam Slack channel](https://apachebeam.slack.com/). If you want
-access, you need to send an email to the user mailing list to [request
-access](mailto:user@beam.apache.org?subject=Regarding Beam Slack
-Channel&body=Hello%0D%0A%0ACan someone please add me to the Beam slack
-channel?%0D%0A%0AThanks.).
-
-Chat rooms are great for quick questions or discussions on specialized topics.
-Remember that we strongly encourage communication via the mailing lists, and we
-prefer to discuss more complex subjects by email. Developers should be careful
-to move or duplicate all the official or useful discussions to the issue
-tracking system and/or the dev mailing list.
-
-## Design
-
-To avoid potential frustration during the code review cycle, we encourage you
-to clearly scope and design non-trivial contributions with the Beam community
-before you start coding.
-
-Generally, the developer mailing list is the best place to get help,
-solicit feedback, and communicate design docs.
-It’s great to explicitly include relevant stakeholders
-early in the conversation. JIRA is useful for keeping track of the current
-state of implementation and automatically gets updated for actions on pull
-requests that start with `[BEAM-JIRA_ID]`.
-
-We suggest using [Google Docs](https://docs.google.com/) for sharing designs
-that may benefit from diagrams or comments. Please remember to make the
-document world-commentable and add a link to it from the relevant JIRA issue.
-You may want to start from this
-[template](https://docs.google.com/document/d/1qYQPGtabN5-E4MjHsecqqC7PXvJtXvZukPfLXQ8rHJs/edit?usp=sharing).
-
-## Code
-
-To contribute code to Apache Beam, you’ll have to do a few administrative steps
-once, and then follow a few guidelines for each contribution.
-
-When developing a new `PTransform`, consult the [PTransform Style Guide]({{
-site.baseurl }}/contribute/ptransform-style-guide).
-
-### One-time Setup
-
-#### [Potentially] Submit Contributor License Agreement
-
-Apache Software Foundation (ASF) desires that all contributors of ideas, code,
-or documentation to the Apache projects complete, sign, and submit an
-[Individual Contributor License
-Agreement](https://www.apache.org/licenses/icla.pdf) (ICLA). The purpose of
-this agreement is to clearly define the terms under which intellectual property
-has been contributed to the ASF and thereby allow us to defend the project
-should there be a legal dispute regarding the software at some future time.
-
-We require you to have an ICLA on file with the Apache Secretary for larger
-contributions only. For smaller ones, however, we rely on [clause
-five](http://www.apache.org/licenses/LICENSE-2.0#contributions) of the Apache
-License, Version 2.0, describing licensing of intentionally submitted
-contributions and do not require an ICLA in that case.
-
-#### Obtain a GitHub account
-
-We use GitHub’s pull request functionality to review proposed code changes.
-
-If you do not already have a personal GitHub account, sign up
-[here](https://github.com/join).
-
-#### Fork the repository on GitHub
-
-Go to the [Beam GitHub repository](https://github.com/apache/beam/) and fork the
-it to your own private account. This will be your private workspace for
-staging changes.
-
-#### Clone the repository locally
-
-You are now ready to create the development environment on your local machine.
-Feel free to repeat these steps on all machines that you want to use for
-development.
-
-We assume you are using SSH-based authentication with GitHub. If necessary,
-exchange SSH keys with GitHub by following [their
-instructions](https://help.github.com/articles/generating-an-ssh-key/).
-
-Clone Beam’s GitHub repository.
-
- $ git clone https://github.com/apache/beam.git
- $ cd beam
-
-Add your forked repository as an additional Git remote, where you’ll push your
-changes.
-
- $ git remote add <GitHub_user> git@github.com:<GitHub_user>/beam.git
-
-You are now ready to start developing!
-
-#### [Python SDK Only] Set up a virtual environment
-
-We recommend setting up a virtual environment for developing Python SDK. Please
-see instructions available in [Quickstart (Python)]({{ site.baseurl
-}}/get-started/quickstart-py/) for setting up a virtual environment.
-
-#### [Optional] IDE Setup
-
-Depending on your preferred development environment, you may need to prepare it
-to develop Beam code. We have some collected tips for [IntelliJ]({{ site.baseurl }}/contribute/intellij)
-and [Eclipse]({{ site.baseurl }}/contribute/eclipse).
-
-### Create a branch in your fork
-
-You’ll work on your contribution in a branch in your own (forked) repository.
-Create a local branch, initialized with the state of the branch you expect your
-changes to be merged into. Keep in mind that we use several branches, including
-`master`, feature-specific, and release-specific branches. If you are unsure,
-initialize with the state of the `master` branch.
-
- $ git fetch --all
- $ git checkout -b <my-branch> origin/master
-
-At this point, you can start making and committing changes to this branch in a
-standard way.
-
-### Syncing and pushing your branch
-
-Periodically while you work, and certainly before submitting a pull request,
-you should update your branch with the most recent changes to the target
-branch.
-
- $ git pull --rebase
-
-Remember to always use `--rebase` parameter to avoid extraneous merge commits.
-
-Then you can push your local, committed changes to your (forked) repository on
-GitHub. Since rebase may change that branch's history, you may need to force
-push. You'll run:
-
- $ git push <GitHub_user> <my-branch> --force
-
-### Testing
-
-All code should have appropriate unit testing coverage. New code should have
-new tests in the same contribution. Bug fixes should include a regression test
-to prevent the issue from reoccurring.
-
-The entire set of tests can be run with this command at the root of the git
-repository.
-
- $ ./gradlew check --rerun-tasks
-
-You can also limit tests to certain language SDKs.
-
- $ ./gradlew beam-sdks-java-core:check --rerun-tasks
- $ ./gradlew beam-sdks-python:check --rerun-tasks
- $ ./gradlew beam-sdks-go:check --rerun-tasks
-
-#### Python SDK
-
-For contributions to the Python code, you can use the commands below to run unit
-tests locally. The above Gradle commands should also work, but these commands
-may run faster for you.
-
-If you update any of the [cythonized](http://cython.org)
-files in Python SDK, you must install the `cython` package before running following
-command to properly test your code. We recommend setting up a virtual
-environment before testing your code.
-
-The following commands should be run in the `sdks/python` directory.
-This command runs all Python tests.
-
- $ python setup.py nosetests
-
-You can use following command to run a single test method.
-
- $ python setup.py nosetests --tests <module>:<test class>.<test method>
-
- Example:
- $ python setup.py nosetests --tests apache_beam.io.textio_test:TextSourceTest.test_progress
-
-To check just for lint errors, run the following command.
-
- $ ../../gradlew lint
-
-##### Remote testing
-
-This step is only required for testing SDK code changes remotely (not using
-directrunner). In order to do this you must build the Beam tarball. From the
-root of the git repository, run:
-
-```
-$ cd sdks/python/
-$ python setup.py sdist
-```
-
-Pass the `--sdk_location` flag to use the newly built version. For example:
-
-```
-$ python setup.py sdist > /dev/null && \
- python -m apache_beam.examples.wordcount ... \
- --sdk_location dist/apache-beam-2.5.0.dev0.tar.gz
-```
-
-## Review
-
-Once the initial code is complete and the tests pass, it’s time to start the
-code review process. All code is peer reviewed, no matter who authors it.
-It’s a great way to build community, since you can learn from other developers,
-and they become familiar with your contribution. It also builds a strong
-project by encouraging a high quality bar and keeping code consistent
-throughout the project.
-
-### Create a pull request
-
-Organize your commits to make a committer’s job easier when reviewing.
-Committers normally prefer multiple small pull requests, instead of a single
-large pull request. Within a pull request, a relatively small number of commits
-that break the problem into logical steps is preferred. For most pull requests,
-you'll squash your changes down to 1 commit. You can use the following command
-to re-order, squash, edit, or change description of individual commits.
-
- $ git rebase -i origin/master
-
-You'll then push to your branch on GitHub. Note: when updating your commit
-after pull request feedback and use squash to get back to one commit, you will
-need to do a force submit to the branch on your repo.
-
-Navigate to the [Beam GitHub mirror](https://github.com/apache/beam) to create
-a pull request. The title of the pull request should be strictly in the
-following format:
-
- [BEAM-<JIRA-issue-#>] <Title of the pull request>
-
-Please include a descriptive pull request message to help make the committer’s
-job easier when reviewing. It’s fine to refer to existing design docs or the
-contents of the associated JIRA as appropriate.
-
-If you know a good committer to review your pull request, please make a comment
-like the following. If not, don’t worry -- a committer will pick it up.
-
- Hi @<GitHub-committer-username>, can you please take a look?
-
-When choosing a committer to review, think about who is the expert on the
-relevant code, who the stakeholders are for this change, and who else would
-benefit from becoming familiar with the code. If you’d appreciate comments from
-additional folks but already have a main committer, you can explicitly cc them
-using `@<GitHub-committer-username>`.
-
-### Code Review and Revision
-
-During the code review process, be careful about whether and when to rebase
-your branch or otherwise modify published commits, since this can remove
-existing comment history and be confusing to the committer when reviewing. When
-you make a revision, always push it in a new commit.
-
-Our GitHub mirror automatically provides pre-commit testing coverage using
-Jenkins. Please make sure those tests pass; the contribution cannot be merged
-otherwise.
-
-### LGTM
-
-Once the committer is happy with the change, they’ll respond with an LGTM
-(“*looks good to me!*”). At this point, the committer may ask you to tidy
-up the commit history before they merge your changes into the codebase.
-This makes it easy for community to look through the history and understand how
-something came about, look for a candidate commit to roll back, etc.
-
-In the case the author is also a committer, either can merge the pull request.
-Just be sure to communicate clearly whose responsibility it is in this
-particular case.
-
-Thank you for your contribution to Beam!
-
-### Deleting your branch
-
-Once the pull request is merged into the Beam repository, you can safely delete
-the branch locally and purge it from your forked repository.
-
-From another local branch, run:
-
- $ git fetch --all
- $ git branch -d <my-branch>
- $ git push <GitHub_user> --delete <my-branch>
-
-### Stale pull requests
-
-The community will close stale pull requests in order to keep the project
-healthy. A pull request becomes stale after its author fails to respond to
-actionable comments for 60 days. Author of a closed pull request is welcome to
-reopen the same pull request again in the future. The associated JIRAs will be
-unassigned from the author but will stay open.
diff --git a/src/contribute/design-principles.md b/src/contribute/design-principles.md
deleted file mode 100644
index 9873237..0000000
--- a/src/contribute/design-principles.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-layout: section
-title: 'Design Principles in Beam'
-section_menu: section-menu/contribute.html
-permalink: /contribute/design-principles/
----
-
-# Design Principles in the Apache Beam Project
-
-Joshua Bloch’s [API Design Bumper Stickers](https://www.infoq.com/articles/API-Design-Joshua-Bloch) are a great list of what makes for good API design. In addition, we have specific design principles we follow in Beam.
-
-* TOC
-{:toc}
-
-## Use cases
-
-### Unify the model
-Provide one model that works over both bounded (aka. batch) and unbounded (aka. streaming) datasets. Pay special attention to windows / triggers / state / timers, which often trip up folks used to a batch world. Provide users with the right abstractions to adjust latency and completeness guarantees to cover both traditional batch and streaming use cases.
-
-### Separate data shapes and runtime requirements
-The model should focus on letting users describe their data and processing, without exposing any details of a specific runtime system. For example, bounded and unbounded describe the shape of data, but batch and streaming describe the behavior of specific runtime systems. Good test cases are to imagine a mythical micro-batching runner that sits somewhere between batch and streaming or a engine that dynamically switches between streaming and batch depending on the backlog.
-
-### Make efficient things easy, rather than make easy things efficient
-Don’t prevent efficiency for ease of use. Design APIs that provide the information necessary for efficiently executing at scale. Provide class hierarchies and wrappers to make the common cases simpler.
-
-## Usability
-
-### Validate Early
-Validate constraints on graph shape, runner requirements, etc as early in the compile time - construction time - submission time - execution time spectrum as reasonably possible in order to provide a smoother user experience.
-
-### Public APIs, like diamonds, are forever (at least until the next major version)
-Backwards incompatible changes can only be made in the next major version. Because of the burden major versions place on users (code has to be modified, conflicting dependency nightmares, etc), we aim to do this infrequently. Clearly mark APIs that are considered experimental (may change at any point) and deprecated (will be removed in the next major version). Consider what APIs are more amenable to future changes (abstract classes vs. interfaces, etc.)
-
-### Examples should be pedagogical
-Canonical examples help people ingrain the principles. Design examples that teach complex concepts in modular chunks. If you can’t explain the concept easily, then the API isn’t right. Examples should withstand random copy-pasting.
-
-## Extensibility
-
-### Use PTransforms for modularity
-Composite transformations (transformations formed by a subgraph of other transformations) are treated as first class objects. They can be named and applied directly in any pipeline to nicely encapsulate concepts. This removes the artificial separation between those built into PCollection and those provided by users. In addition, PTransforms can be used as a clear concept in graphical monitoring and provide a way to scope metadata like aggregators, logging, and resources. Use these when b [...]
-
-### Keep Beam SDKs consistent
-Beam SDKs should expose the complete set of concepts in the programming model. They should all use the same set of abstractions and be able to share conceptual documentation.
-
-### When in ~~Rome~~ Python, do as the ~~Romans~~ Pythonians do
-Each SDK must feel right to those who live and breath that language. Adapt the general Beam concepts into language-dependent styles when the benefits clearly outweigh the drawbacks.
-
-### Encourage DSLs
-Many use cases or user communities can be served by provided ‘wrapper’ SDKs that provide a simpler or domain-specific set of abstractions that then build on a Beam SDK and take advantage of Beam Runners.
-
-### Design for the model, not specific runners
-
-The Beam APIs should serve all runners. Behind every runner-specific hook, there is a general principle in the model. Design APIs that generalize across multiple runners.
diff --git a/src/contribute/eclipse.md b/src/contribute/eclipse.md
index 346fbaa..c60726b 100644
--- a/src/contribute/eclipse.md
+++ b/src/contribute/eclipse.md
@@ -31,27 +31,21 @@ from the commandline by building a sample package:
./gradlew :beam-examples-java:build
```
-If you receive any errors, first verify your environment setup based on the
-[Contribution guide]({{ site.baseurl }}/contribute/contribution-guide#one-time-setup).
+If you receive any errors, first verify your environment setup:
1. If running on Mac or Linux, launch Eclipse from a terminal. This is necessary
to ensure that Eclipse has proper environment setup from user profile
scripts, i.e. .bashrc.
-
-1. Install [Buildship Gradle
+2. Install [Buildship Gradle
Integration](https://marketplace.eclipse.org/content/buildship-gradle-integration).
This will allow importing and interacting with the Gradle build.
-
-1. Open the project import wizard in Eclipse via "File" > "Import".
-
-1. From the "Import" screen, select "Gradle" > "Existing Gradle Project", and click
+3. Open the project import wizard in Eclipse via "File" > "Import".
+4. From the "Import" screen, select "Gradle" > "Existing Gradle Project", and click
Next.
-
-1. From the "Import Gradle Project" screen, fill in the Project root directory
+5. From the "Import Gradle Project" screen, fill in the Project root directory
with your local git path, and click Finish.
-Eclipse will scan the project tree and import each as a separate
-Package.
+Eclipse will scan the project tree and import each as a separate Package.
Verify that your workspace is correctly configured by invoking
'beam-runners-direct-java:build' from the "Gradle Tasks" pane. The build should
diff --git a/src/contribute/index.md b/src/contribute/index.md
index f265910..88cc838 100644
--- a/src/contribute/index.md
+++ b/src/contribute/index.md
@@ -1,26 +1,183 @@
---
layout: section
-title: 'Contribute to Beam'
+title: "Beam Contribution Guide"
+permalink: /contribute/
section_menu: section-menu/contribute.html
-redirect_from: '/docs/contribute'
+redirect_from:
+ - /contribution-guide/
+ - /contribute/contribution-guide/
+ - /docs/contribute/
+ - /contribute/feature-branches/
+ - /contribute/work-in-progress/
+ - /contribute/source-repository/
+ - /contribute/design-principles/
---
-# Contribute to the Apache Beam Project
+# Apache Beam Contribution Guide
-Learn how you can contribute to Beam:
+The Apache Beam community welcomes contributions from anyone!
-#### [Contribution Guide]({{ site.baseurl }}/contribute/contribution-guide/)
-Learn how to contribute to the Beam project.
+There are lots of opportunities:
-#### [Technical Vision](https://goo.gl/nk5OM0)
-Learn about the technical vision for Beam, including the designs for SDKs and runners, and the development process.
+ - write new examples
+ - improve the documentation
+ - add new user-facing libraries (new statistical libraries, new IO connectors,
+ etc)
+ - improve your favorite language SDK (Java, Python, Go, etc)
+ - improve specific runners (Apache Apex, Apache Flink, Apache Spark, Google
+ Cloud Dataflow, etc)
+ - work on the core programming model (what is a Beam pipeline and how does it
+ run?)
-#### [PTransform Style Guide]({{ site.baseurl }}/contribute/ptransform-style-guide)
-Learn about the best practices for developing new PTransforms.
+Most importantly, if you have an idea of how to contribute, then do it!
-#### Resources
-Resources for contributing to Beam, including mailing lists, the main GitHub repo, and the issues tracker.
+For a list of open starter tasks, check
+[https://s.apache.org/beam-starter-tasks](https://s.apache.org/beam-starter-tasks).
-* [Mailing Lists]({{ site.baseurl }}/get-started/support/)
-* [Source Repository]({{ site.baseurl }}/contribute/source-repository)
-* [Issue Tracking]({{ site.baseurl }}/get-started/support/)
+And, of course, we would love if you [contact us]({{ site.baseurl
+}}/community/contact-us/) and introduce yourself.
+
+## Contributing code
+
+Coding happens at
+[https://github.com/apache/beam](https://github.com/apache/beam). To
+contribute, follow the usual GitHub process: fork the repo, make your changes,
+and open a pull request. If you are unfamiliar with this workflow, GitHub
+maintains these helpful guides:
+
+ - [Git Handbook](https://guides.github.com/introduction/git-handbook/)
+ - [Forking a repository](https://guides.github.com/activities/forking/)
+
+If your change is large, it is a good idea to [discuss it on the dev@ mailing list]({{
+site.baseurl }}/community/contact-us/). You will also
+need to submit a signed [Individual Contributor License
+Agreement](https://www.apache.org/licenses/icla.pdf) (ICLA) to the Apache
+Software Foundation (ASF). The purpose of this agreement is to clearly define
+the terms under which intellectual property has been contributed to the ASF and
+thereby allow us to defend the project should there be a legal dispute
+regarding the software at some future time.
+
+If you are contributing a `PTransform` to Beam, we have an extensive
+[PTransform Style Guide]({{ site.baseurl }}/contribute/ptransform-style-guide).
+
+### Building & Testing
+
+We use Gradle to orchestrate building and testing.
+
+The entire set of tests can be run with this command at the root of the git
+repository.
+
+ $ ./gradlew check
+
+You can limit testing to a particular module and Gradle will build just the
+necessary things to run those tests. For example:
+
+ $ ./gradlew -p sdks/go check
+ $ ./gradlew -p sdks/java/io/cassandra check
+ $ ./gradlew -p runners/flink check
+
+### Testing the Python SDK
+
+You can directly use the Python toolchain instead of having Gradle orchestrate
+it. This may be faster for you. We recommend setting up a virtual environment
+before testing your code.
+
+If you update any of the [cythonized](http://cython.org) files in Python SDK,
+you must install the `cython` package before running following command to
+properly test your code.
+
+The following commands should be run in the `sdks/python` directory.
+This command runs all Python tests.
+
+ $ python setup.py nosetests
+
+You can use following command to run a single test method.
+
+ $ python setup.py nosetests --tests <module>:<test class>.<test method>
+
+ Example:
+ $ python setup.py nosetests --tests apache_beam.io.textio_test:TextSourceTest.test_progress
+
+To check just for lint errors, run the following command.
+
+ $ ../../gradlew lint
+
+#### Remote testing
+
+This step is only required for testing SDK code changes remotely (not using
+directrunner). In order to do this you must build the Beam tarball. From the
+root of the git repository, run:
+
+```
+$ cd sdks/python/
+$ python setup.py sdist
+```
+
+Pass the `--sdk_location` flag to use the newly built version. For example:
+
+```
+$ python setup.py sdist > /dev/null && \
+ python -m apache_beam.examples.wordcount ... \
+ --sdk_location dist/apache-beam-2.5.0.dev0.tar.gz
+```
+
+## Contributing to the website
+
+The Beam website is in the [Beam Site GitHub
+mirror](https://github.com/apache/beam-site) repository in the `asf-site`
+branch (_not_ `master`). The
+[README](https://github.com/apache/beam-site/blob/asf-site/README.md) there
+explains how to modify different parts of the site. The GitHub workflow is the
+same - make your change and open a pull request.
+
+Issues are tracked in the
+[website](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20website)
+component in JIRA.
+
+## Works in progress
+
+A great way to contribute is to join an existing effort. There are many
+works in progress, some on branches because they are very incomplete.
+
+### Portability Framework
+
+The primary Beam vision: Any SDK on any runner. This is a cross-cutting effort
+across Java, Python, and Go, and every Beam runner.
+
+ - [Read more]({{ site.baseurl }}/contribute/portability/)
+
+### Apache Spark 2.0 Runner
+
+ - Feature branch: [runners-spark2](https://github.com/apache/beam/tree/runners-spark2)
+ - Contact: [Jean-Baptiste Onofré](mailto:jbonofre@apache.org)
+
+### JStorm Runner
+
+ - [Docs]({{ site.baseurl }}/documentation/runners/jstorm)
+ - Feature branch: [jstorm-runner](https://github.com/apache/beam/tree/jstorm-runner)
+ - JIRA: [runner-jstorm](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20runner-jstorm) / [BEAM-1899](https://issues.apache.org/jira/browse/BEAM-1899)
+ - Contact: [Pei He](mailto:pei@apache.org)
+
+### MapReduce Runner
+
+ - Feature branch: [mr-runner](https://github.com/apache/beam/tree/mr-runner)
+ - JIRA: [runner-mapreduce](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20runner-mapreduce) / [BEAM-165](https://issues.apache.org/jira/browse/BEAM-165)
+ - Contact: [Pei He](mailto:pei@apache.org)
+
+### Tez Runner
+
+ - Feature branch: [tez-runner](https://github.com/apache/beam/tree/tez-runner)
+ - JIRA: [runner-tez](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20runner-tez) / [BEAM-2709](https://issues.apache.org/jira/browse/BEAM-2709)
+
+### Go SDK
+
+ - JIRA: [sdk-go](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20sdk-go) / [BEAM-2083](https://issues.apache.org/jira/browse/BEAM-2083) |
+ - Contact: [Henning Rohde](mailto:herohde@google.com)
+
+## Stale pull requests
+
+The community will close stale pull requests in order to keep the project
+healthy. A pull request becomes stale after its author fails to respond to
+actionable comments for 60 days. Author of a closed pull request is welcome to
+reopen the same pull request again in the future. The associated JIRAs will be
+unassigned from the author but will stay open.
diff --git a/src/contribute/source-repository.md b/src/contribute/source-repository.md
deleted file mode 100644
index 2d7c57e..0000000
--- a/src/contribute/source-repository.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: section
-title: "Beam Source Repository"
-section_menu: section-menu/contribute.html
-permalink: /contribute/source-repository/
-redirect_from: /source_repository/
----
-
-# Apache Beam Source Repository
-
-This project uses [Git](http://git-scm.com) to manage its source code.
-
-## Web Browser Access
-The following is a link to a browsable version of the source repository:
-
-[https://gitbox.apache.org/repos/asf/beam.git](https://gitbox.apache.org/repos/asf/beam.git)
-
-## Anonymous Access
-The source can be checked out anonymously from Git with this command (See http://git-scm.com/docs/git-clone):
-
- $ git clone https://gitbox.apache.org/repos/asf/beam.git
-
-## Developer Access
-Only project developers can access the Git tree via this method (See http://git-scm.com/docs/git-clone).
-
- $ git clone https://gitbox.apache.org/repos/asf/beam.git
-
-## Access from Behind a Firewall
-Refer to the documentation of the SCM used for more information about access behind a firewall.
diff --git a/src/contribute/work-in-progress.md b/src/contribute/work-in-progress.md
deleted file mode 100644
index b766b7b..0000000
--- a/src/contribute/work-in-progress.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: section
-title: 'In Progress Work in Beam'
-section_menu: section-menu/contribute.html
-permalink: /contribute/work-in-progress/
----
-
-# Work In Progress in the Apache Beam Project
-
-As mentioned in the [Contribution Guide]({{ site.baseurl }}/contribute/contribution-guide/), all work in Beam is tracked in our [Apache JIRA](https://issues.apache.org/jira/browse/BEAM). In addition, the following types of work may be of particular interest to the Beam community.
-
-* TOC
-{:toc}
-
-
-## Starter Tasks
-
-The community regular tags good getting started tasks with the label `starter`. Use a quick [JIRA search](https://issues.apache.org/jira/issues?jql=project%20%3D%20BEAM%20AND%20status%20%3D%20Open%20AND%20labels%20%3D%20starter) to identify ways you can get started [contributing]({{ site.baseurl }}/contribute/contribution-guide/) to Beam.
-
-## Feature Branches
-
-Larger features with multiple active developers may be developed on a [feature branch]({{ site.baseurl }}/contribute/feature-branches/) before being merged in the master branch. In particular, this is often used for initial development of new components like SDKs or runners.
-
-Current branches include:
-
-| Feature | Branch | JIRA Component | More Info |
-| ---- | ---- | ---- | ---- |
-| Apache Spark 2.0 Runner | [runners-spark2](https://github.com/apache/beam/tree/runners-spark2) | - | [thread](https://lists.apache.org/thread.html/e38ac4e4914a6cb1b865b1f32a6ca06c2be28ea4aa0f6b18393de66f@%3Cdev.beam.apache.org%3E) |
-| [JStorm Runner]({{ site.baseurl }}/documentation/runners/jstorm) | [jstorm-runner](https://github.com/apache/beam/tree/jstorm-runner) | [runner-jstorm](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20runner-jstorm) | [BEAM-1899](https://issues.apache.org/jira/browse/BEAM-1899) |
-| MapReduce Runner | [mr-runner](https://github.com/apache/beam/tree/mr-runner) | [runner-mapreduce](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20runner-mapreduce) | [BEAM-165](https://issues.apache.org/jira/browse/BEAM-165) |
-| Tez Runner | [tez-runner](https://github.com/apache/beam/tree/tez-runner) | [runner-tez](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20runner-tez) | [BEAM-2709](https://issues.apache.org/jira/browse/BEAM-2709) |
-| Go SDK | master | [sdk-go](https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20sdk-go) | [BEAM-2083](https://issues.apache.org/jira/browse/BEAM-2083) |
-{:.table}
--
To stop receiving notification emails like this one, please contact
mergebot-role@apache.org.