Repository: incubator-apex-site Updated Branches: refs/heads/asf-site 415d55da9 -> 20b53483c
from c55ae71de47addde5a8713ed2b64aa31c58510ed Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/20b53483 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/20b53483 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/20b53483 Branch: refs/heads/asf-site Commit: 20b53483c4f8e1de610968269b85d6be2f3d4773 Parents: 415d55d Author: Andy Perlitch <[email protected]> Authored: Fri Sep 18 10:14:39 2015 -0700 Committer: Andy Perlitch <[email protected]> Committed: Fri Sep 18 10:14:39 2015 -0700 ---------------------------------------------------------------------- content/community.html | 1 + content/docs.html | 1 + content/github-mirror-pull-requests.html | 91 +++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/20b53483/content/community.html ---------------------------------------------------------------------- diff --git a/content/community.html b/content/community.html index eaaff78..9438990 100644 --- a/content/community.html +++ b/content/community.html @@ -64,6 +64,7 @@ <li><a href="https://github.com/apache/incubator-apex-core";>Apex Core</a> - The core of the Apex platform.</li> <li><a href="https://github.com/apache/incubator-apex-malhar";>Apex Malhar</a> - Community-driven set of open-source "operators" and utilities for use in your Apex applications.</li> </ul> + <p>To learn more about how we use Github to accept contributions to the project, <a href="/github-mirror-pull-requests.html">check out this doc</a>.</p> <h2 id="issue-tracking">Issue Tracking</h2> <p><a href="https://malhar.atlassian.net/projects/APEX/issues";>Apex JIRA</a></p> http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/20b53483/content/docs.html ---------------------------------------------------------------------- diff --git a/content/docs.html b/content/docs.html index 8092305..1735eb8 100644 --- a/content/docs.html +++ b/content/docs.html @@ -58,6 +58,7 @@ <li><a href="https://www.datatorrent.com/docs/guides/ApplicationDeveloperGuide.html";>Application Developer Guide</a></li> <li><a href="https://www.datatorrent.com/docs/guides/ApplicationPackages.html";>Application Packages Guide</a></li> <li><a href="https://www.datatorrent.com/docs/guides/OperatorDeveloperGuide.html";>Operator Developer Guide</a></li> + <li><a href="/github-mirror-pull-requests.html">Merging Github Mirror Pull Requests</a></li> </ul> </div> http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/20b53483/content/github-mirror-pull-requests.html ---------------------------------------------------------------------- diff --git a/content/github-mirror-pull-requests.html b/content/github-mirror-pull-requests.html new file mode 100644 index 0000000..4af002f --- /dev/null +++ b/content/github-mirror-pull-requests.html @@ -0,0 +1,91 @@ +<html lang="en"><head> + + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> + <meta name="description" content="Apex is an enterprise grade native YARN big data-in-motion platform that unifies stream processing as well as batch processing."> + <meta name="author" content="Apache Software Foundation"> + <link rel="icon" href="favicon.ico"> + + <title>Apache Apex (Incubating)</title> + + <!-- Main Stylesheet --> + <link href="css/main.css" rel="stylesheet"> + + </head> + + <body> + <nav class="navbar navbar-static-top" id="main-nav"> + <div class="container"> + <a class="navbar-brand" href="/">Apache Apex <small>(incubating)</small></a> + <ul class="nav nav-pills navbar-right"> + <li class="nav-item"> + <a class="nav-link" href="/">Home</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="/community.html">Community</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="/docs.html">Docs</a> + </li> + <li class="nav-item"> + <a href="#" data-toggle="dropdown" class="dropdown-toggle nav-link">Github<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="https://github.com/apache/incubator-apex-core";>Apex Core</a></li> + <li><a href="https://github.com/apache/incubator-apex-malhar";>Apex Malhar</a></li> + </ul> + </li> + <li class="nav-item"> + <a href="#" data-toggle="dropdown" class="dropdown-toggle nav-link">Apache<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://incubator.apache.org/projects/apex.html";>Status Page</a></li> + <li><a href="http://www.apache.org/foundation/how-it-works.html";>Apache Foundation</a></li> + <li><a href="http://www.apache.org/licenses/";>Apache License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + </ul> + </li> + </ul> + </div> + </nav> +<div class="container"> + + <h1 id="submitting-and-merging-pull-requests-via-the-github-mirror">Submitting and Merging Pull Requests via the Github Mirror</h1> + <p>The apex core and apex malhar repositories both have mirror repositories on github which are used to review Pull Requests and provide a second remote endpoint for the codebase.</p> + <h2 id="opening-a-pull-request">Opening a Pull Request</h2> + <p>Fork the ASF github mirror:</p> + <p><a href="https://github.com/apache/incubator-apex-core/";>https://github.com/apache/incubator-apex-core/</a></p> + <p>You can then update your local repository to add the new fork as remote. No + need for another clone or to recreate your workspace.</p> + <p>Once your feature is complete, submit the pull request. Ensure that the + Apex JIRA numbers are part of the commit message (we have not migrated to + ASF JIRA yet).</p> + <h2 id="merging-a-pull-request-must-be-a-committer-">Merging a Pull Request (must be a committer)</h2> + <p>The ASF master repository is: <code>https://git-wip-us.apache.org/repos/asf/incubator-apex-core.git</code></p> + <p>Access: <a href="https://git-wip-us.apache.org/#committers-getting-started";>https://git-wip-us.apache.org/#committers-getting-started</a></p> + <p>Use the command line to pull in the changes from the pull requests. Since + the github mirror is readonly, you will not be shown the convenient command + line instructions :-( Good opportunity to remember the git commands!</p> + <p>Once done with verification, push the changes to the master. Within a few + seconds, the changes will propagate back to the github mirror and the pull + requests be closed and marked merged.</p> + <p><strong>Note: since none of us has write access to the mirror, only the author of a + pull request can close it.</strong></p> + +</div> + + <hr> + <div class="container"> + <footer> + <p>© Apache Software Foundation 2015</p> + </footer> + </div> <!-- /container --> + + <!-- Placed at the end of the document so the pages load faster --> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";></script> + <script src="/js/bootstrap.min.js"></script> + + +</body> +</html>
