Repository: orc
Updated Branches:
  refs/heads/asf-site 19d7c2132 -> 74a2ad6f2


Push updated developer documentation.

Signed-off-by: Owen O'Malley <omal...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/74a2ad6f
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/74a2ad6f
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/74a2ad6f

Branch: refs/heads/asf-site
Commit: 74a2ad6f2193df9bfc62f86dd90b3dba5693d94e
Parents: 19d7c21
Author: Owen O'Malley <omal...@apache.org>
Authored: Tue Apr 10 20:22:50 2018 -0700
Committer: Owen O'Malley <omal...@apache.org>
Committed: Tue Apr 10 20:22:50 2018 -0700

----------------------------------------------------------------------
 develop/bylaws.html       |   5 +-
 develop/committers.html   | 359 +++++++++++++++++++++++++++++++++++++++++
 develop/index.html        | 347 +++++++++++++++------------------------
 develop/make-release.html |   4 +-
 4 files changed, 496 insertions(+), 219 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/orc/blob/74a2ad6f/develop/bylaws.html
----------------------------------------------------------------------
diff --git a/develop/bylaws.html b/develop/bylaws.html
index 246291a..e8e0ae8 100644
--- a/develop/bylaws.html
+++ b/develop/bylaws.html
@@ -335,8 +335,9 @@ those who have binding votes over the action.</p>
 <h4 id="code-change">Code Change</h4>
 
 <p>A change made to a codebase of the project requires <em>lazy consensus</em>
-of active committers other than the author of the patch. The code can
-be committed after the first +1.</p>
+of active committers other than the author of the patch. We can commit
+changes before they have been reviewed, although we prefer to get
+reviews first.</p>
 
 <h4 id="product-release">Product Release</h4>
 

http://git-wip-us.apache.org/repos/asf/orc/blob/74a2ad6f/develop/committers.html
----------------------------------------------------------------------
diff --git a/develop/committers.html b/develop/committers.html
new file mode 100644
index 0000000..4831481
--- /dev/null
+++ b/develop/committers.html
@@ -0,0 +1,359 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>Project Members</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <meta name="generator" content="Jekyll v2.4.0">
+  <link rel="stylesheet" 
href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
+  <link rel="stylesheet" href="/css/screen.css">
+  <link rel="icon" type="image/x-icon" href="/favicon.ico">
+  <!--[if lt IE 9]>
+  <script src="/js/html5shiv.min.js"></script>
+  <script src="/js/respond.min.js"></script>
+  <![endif]-->
+</head>
+
+
+<body class="wrap">
+  <header role="banner">
+  <nav class="mobile-nav show-on-mobiles">
+    <ul>
+  <li class="">
+    <a href="/">Home</a>
+  </li>
+  <li class="">
+    <a href="/docs/"><span class="show-on-mobiles">Docs</span>
+                     <span class="hide-on-mobiles">Documentation</span></a>
+  </li>
+  <li class="">
+    <a href="/talks/">Talks</a>
+  </li>
+  <li class="">
+    <a href="/news/">News</a>
+  </li>
+  <li class="">
+    <a href="/help/">Help</a>
+  </li>
+  <li class="current">
+    <a href="/develop/">Develop</a>
+  </li>
+</ul>
+
+  </nav>
+  <div class="grid">
+    <div class="unit one-third center-on-mobiles">
+      <h1>
+        <a href="/">
+          <span class="sr-only">Apache ORC</span>
+          <img src="/img/logo.png" width="249" height="101" alt="ORC Logo">
+        </a>
+      </h1>
+    </div>
+    <nav class="main-nav unit two-thirds hide-on-mobiles">
+      <ul>
+  <li class="">
+    <a href="/">Home</a>
+  </li>
+  <li class="">
+    <a href="/docs/"><span class="show-on-mobiles">Docs</span>
+                     <span class="hide-on-mobiles">Documentation</span></a>
+  </li>
+  <li class="">
+    <a href="/talks/">Talks</a>
+  </li>
+  <li class="">
+    <a href="/news/">News</a>
+  </li>
+  <li class="">
+    <a href="/help/">Help</a>
+  </li>
+  <li class="current">
+    <a href="/develop/">Develop</a>
+  </li>
+</ul>
+
+    </nav>
+  </div>
+</header>
+
+
+  <section class="standalone">
+  <div class="grid">
+
+    <div class="unit whole">
+      <article>
+        <h1>Project Members</h1>
+        <h2 id="project-members">Project Members</h2>
+
+<table>
+  <thead>
+    <tr>
+      <th style="text-align: left">Name</th>
+      <th style="text-align: left">Apache Id</th>
+      <th style="text-align: left">Role</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td style="text-align: left">Aliaksei Sandryhaila</td>
+      <td style="text-align: left">asandryh</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Chris Douglas</td>
+      <td style="text-align: left">cdouglas</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Chinna Rao Lalam</td>
+      <td style="text-align: left">chinnaraol</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Chaoyu Tang</td>
+      <td style="text-align: left">ctang</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Carl Steinbach</td>
+      <td style="text-align: left">cws</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Daniel Dai</td>
+      <td style="text-align: left">daijy</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Deepak Majeti</td>
+      <td style="text-align: left">mdeepak</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Eugene Koifman</td>
+      <td style="text-align: left">ekoifman</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Gang Wu</td>
+      <td style="text-align: left">gangwu</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Alan Gates</td>
+      <td style="text-align: left">gates</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Gopal Vijayaraghavan</td>
+      <td style="text-align: left">gopalv</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Gunther Hagleitner</td>
+      <td style="text-align: left">gunther</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Ashutosh Chauhan</td>
+      <td style="text-align: left">hashutosh</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Jesus Camacho Rodriguez</td>
+      <td style="text-align: left">jcamacho</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Jason Dere</td>
+      <td style="text-align: left">jdere</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Jimmy Xiang</td>
+      <td style="text-align: left">jxiang</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Kevin Wilfong</td>
+      <td style="text-align: left">kevinwilfong</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Lars Francke</td>
+      <td style="text-align: left">larsfrancke</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Lefty Leverenz</td>
+      <td style="text-align: left">leftyl</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Rui Li</td>
+      <td style="text-align: left">lirui</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Mithun Radhakrishnan</td>
+      <td style="text-align: left">mithun</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Matthew McCline</td>
+      <td style="text-align: left">mmccline</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Naveen Gangam</td>
+      <td style="text-align: left">ngangam</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Owen O’Malley</td>
+      <td style="text-align: left">omalley</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Prasanth Jayachandran</td>
+      <td style="text-align: left">prasanthj</td>
+      <td style="text-align: left">PMC</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Pengcheng Xiong</td>
+      <td style="text-align: left">pxiong</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Rajesh Balamohan</td>
+      <td style="text-align: left">rbalamohan</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Sergey Shelukhin</td>
+      <td style="text-align: left">sershe</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Sergio Pena</td>
+      <td style="text-align: left">spena</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Siddharth Seth</td>
+      <td style="text-align: left">sseth</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Stephen Walkauskas</td>
+      <td style="text-align: left">swalkaus</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Vaibhav Gumashta</td>
+      <td style="text-align: left">vgumashta</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Wei Zheng</td>
+      <td style="text-align: left">weiz</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Xiening Dai</td>
+      <td style="text-align: left">xndai</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Xuefu Zhang</td>
+      <td style="text-align: left">xuefu</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Ferdinand Xu</td>
+      <td style="text-align: left">xuf</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Yongzhi Chen</td>
+      <td style="text-align: left">ychena</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+    <tr>
+      <td style="text-align: left">Aihua Xu</td>
+      <td style="text-align: left">zihuaxu</td>
+      <td style="text-align: left">Committer</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Companies with employees that are committers:</p>
+
+<ul>
+  <li>Alibaba</li>
+  <li>Cloudera</li>
+  <li>Facebook</li>
+  <li>Hortonworks</li>
+  <li>Intel</li>
+  <li>LinkedIn</li>
+  <li>Microsoft</li>
+  <li>Vertica</li>
+  <li>Yahoo</li>
+</ul>
+
+      </article>
+    </div>
+
+    <div class="clear"></div>
+
+  </div>
+</section>
+
+
+  <footer role="contentinfo">
+  <p>The contents of this website are &copy;&nbsp;2018
+     <a href="https://www.apache.org/";>Apache Software Foundation</a>
+     under the terms of the <a
+      href="https://www.apache.org/licenses/LICENSE-2.0.html";>
+      Apache&nbsp;License&nbsp;v2</a>. Apache ORC and its logo are trademarks
+      of the Apache Software Foundation.</p>
+</footer>
+
+  <script>
+  var anchorForId = function (id) {
+    var anchor = document.createElement("a");
+    anchor.className = "header-link";
+    anchor.href      = "#" + id;
+    anchor.innerHTML = "<span class=\"sr-only\">Permalink</span><i class=\"fa 
fa-link\"></i>";
+    anchor.title = "Permalink";
+    return anchor;
+  };
+
+  var linkifyAnchors = function (level, containingElement) {
+    var headers = containingElement.getElementsByTagName("h" + level);
+    for (var h = 0; h < headers.length; h++) {
+      var header = headers[h];
+
+      if (typeof header.id !== "undefined" && header.id !== "") {
+        header.appendChild(anchorForId(header.id));
+      }
+    }
+  };
+
+  document.onreadystatechange = function () {
+    if (this.readyState === "complete") {
+      var contentBlock = document.getElementsByClassName("docs")[0] || 
document.getElementsByClassName("news")[0];
+      if (!contentBlock) {
+        return;
+      }
+      for (var level = 1; level <= 6; level++) {
+        linkifyAnchors(level, contentBlock);
+      }
+    }
+  };
+</script>
+
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/orc/blob/74a2ad6f/develop/index.html
----------------------------------------------------------------------
diff --git a/develop/index.html b/develop/index.html
index 2537832..c5a842b 100644
--- a/develop/index.html
+++ b/develop/index.html
@@ -85,219 +85,21 @@
       <article>
         <h1>Developing</h1>
         <p>Information about the ORC project that is most important for
-developers working on the project. The project has created
-<a href="bylaws.html">bylaws</a> for itself.</p>
-
-<h2 id="project-members">Project Members</h2>
-
-<table>
-  <thead>
-    <tr>
-      <th style="text-align: left">Name</th>
-      <th style="text-align: left">Apache Id</th>
-      <th style="text-align: left">Role</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td style="text-align: left">Aliaksei Sandryhaila</td>
-      <td style="text-align: left">asandryh</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Chris Douglas</td>
-      <td style="text-align: left">cdouglas</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Chinna Rao Lalam</td>
-      <td style="text-align: left">chinnaraol</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Chaoyu Tang</td>
-      <td style="text-align: left">ctang</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Carl Steinbach</td>
-      <td style="text-align: left">cws</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Daniel Dai</td>
-      <td style="text-align: left">daijy</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Deepak Majeti</td>
-      <td style="text-align: left">mdeepak</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Eugene Koifman</td>
-      <td style="text-align: left">ekoifman</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Alan Gates</td>
-      <td style="text-align: left">gates</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Gopal Vijayaraghavan</td>
-      <td style="text-align: left">gopalv</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Gunther Hagleitner</td>
-      <td style="text-align: left">gunther</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Ashutosh Chauhan</td>
-      <td style="text-align: left">hashutosh</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Jesus Camacho Rodriguez</td>
-      <td style="text-align: left">jcamacho</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Jason Dere</td>
-      <td style="text-align: left">jdere</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Jimmy Xiang</td>
-      <td style="text-align: left">jxiang</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Kevin Wilfong</td>
-      <td style="text-align: left">kevinwilfong</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Lars Francke</td>
-      <td style="text-align: left">larsfrancke</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Lefty Leverenz</td>
-      <td style="text-align: left">leftyl</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Rui Li</td>
-      <td style="text-align: left">lirui</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Mithun Radhakrishnan</td>
-      <td style="text-align: left">mithun</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Matthew McCline</td>
-      <td style="text-align: left">mmccline</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Naveen Gangam</td>
-      <td style="text-align: left">ngangam</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Owen O’Malley</td>
-      <td style="text-align: left">omalley</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Prasanth Jayachandran</td>
-      <td style="text-align: left">prasanthj</td>
-      <td style="text-align: left">PMC</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Pengcheng Xiong</td>
-      <td style="text-align: left">pxiong</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Rajesh Balamohan</td>
-      <td style="text-align: left">rbalamohan</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Sergey Shelukhin</td>
-      <td style="text-align: left">sershe</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Sergio Pena</td>
-      <td style="text-align: left">spena</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Siddharth Seth</td>
-      <td style="text-align: left">sseth</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Stephen Walkauskas</td>
-      <td style="text-align: left">swalkaus</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Vaibhav Gumashta</td>
-      <td style="text-align: left">vgumashta</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Wei Zheng</td>
-      <td style="text-align: left">weiz</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Xuefu Zhang</td>
-      <td style="text-align: left">xuefu</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Ferdinand Xu</td>
-      <td style="text-align: left">xuf</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Yongzhi Chen</td>
-      <td style="text-align: left">ychena</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-    <tr>
-      <td style="text-align: left">Aihua Xu</td>
-      <td style="text-align: left">zihuaxu</td>
-      <td style="text-align: left">Committer</td>
-    </tr>
-  </tbody>
-</table>
-
-<p>Companies with employees that are committers:</p>
+developers working on the project.</p>
 
-<ul>
-  <li>Cloudera</li>
-  <li>Facebook</li>
-  <li>Hewlett Packard Enterprise</li>
-  <li>Hortonworks</li>
-  <li>Intel</li>
-  <li>LinkedIn</li>
-  <li>Microsoft</li>
-  <li>Yahoo</li>
-</ul>
+<h2 id="development-community">Development community</h2>
+
+<p>We have committers from many different companies. The full
+list of <a href="committers.html">ORC committers</a> is available.</p>
 
 <h2 id="mailing-lists">Mailing Lists</h2>
 
-<p>There are several development mailing lists for ORC:</p>
+<p>The most important communication mechanism for the project are its
+mailing lists.  The mailing lists have the advantage that they are
+publicly archived and work well asynchronously across timezones.</p>
+
+<p>Beside the user mailing list, there are several development mailing
+lists for ORC:</p>
 
 <ul>
   <li><a 
href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#111;&#114;&#099;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">&#100;&#101;&#118;&#064;&#111;&#114;&#099;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;</a>
 - Development discussions
@@ -312,31 +114,146 @@ with archive <a 
href="https://mail-archives.apache.org/mod_mbox/orc-commits/";>he
 <em>list</em>-subscr...@orc.apache.org and unsubscribe by sending email to
 <em>list</em>-unsubscr...@orc.apache.org.</p>
 
+<h2 id="bug-reports">Bug reports</h2>
+
+<p>Each code change requires a <a href="/jira">jira</a> to track the 
discussion of the change.</p>
+
 <h2 id="source-code">Source code</h2>
 
-<p>ORC uses git for version control. Get the source code:</p>
+<p>ORC uses git for version control. Get the source code and configure it
+to fetch the pull requests also:</p>
+
+<pre><code>% git clone -o apache g...@github.com:apache/orc.git
+% cd orc
+% git config --add remote.apache.fetch 
'+refs/pull/*/head:refs/remotes/apache/pr/*'
+</code></pre>
+
+<p>Pull requests will be named “apache/pr/999” for pull request 999.</p>
 
-<p><code>% git clone https://git-wip-us.apache.org/repos/asf/orc.git</code></p>
+<p>If you are a committer, add the push url:</p>
+
+<pre><code>% git remote set-url --push apache 
https://git-wip-us.apache.org/repos/asf/orc.git
+</code></pre>
 
 <p>The important branches are:</p>
 
 <ul>
   <li><a href="https://github.com/apache/orc/tree/master";>master</a> -
-The trunk for all developement</li>
+The master branch for all development</li>
+  <li>branch-X.Y - The release branches</li>
   <li><a href="https://github.com/apache/orc/tree/asf-site";>asf-site</a> -
-The pages that are deployed to https://orc.apache.org/</li>
+The generated html pages that are deployed as https://orc.apache.org/</li>
 </ul>
 
-<p>Please check our <a href="/develop/coding.html">coding guidelines</a>.</p>
+<p>Releases are tagged as “rel/release-X.Y.Z”. Apache’s git repository
+guarantees that tags in the “rel/*” namespace are never deleted or
+changed.</p>
+
+<p>Please check our <a href="coding.html">coding guidelines</a>.</p>
 
 <h2 id="reviews">Reviews</h2>
 
 <p>ORC uses Commit-Then-Review, so patches can be committed without a
 committer’s review. However, most changes should be reviewed first.</p>
 
+<h2 id="approving-a-pull-request">Approving a pull request</h2>
+
+<p>Fetch the current state of the project:</p>
+
+<pre><code>% git fetch apache
+</code></pre>
+
+<p>Switch to the branch:</p>
+
+<pre><code>% git checkout apache/pr/999
+</code></pre>
+
+<p>You’ll want to rebase it and make it a single commit by squashing
+the commits into a single commit.</p>
+
+<pre><code>% git rebase -i apache/master
+</code></pre>
+
+<p>Update the commit message to sign it using your GPG key and close the
+pull request:</p>
+
+<pre><code>% git commit --amend -s -S
+</code></pre>
+
+<p>Ensure the first line of the commit starts with the jira number
+(eg. ORC-123) and includes a description of what was changed. Also add
+a line such as “Fixes #999”, which asks the Apache infrastructure to
+close pull request 999. If you wish you close a pull request without
+claiming to have fixed the problem, the form “Closes #999” also works.</p>
+
+<p>Finally, push the result to Apache:</p>
+
+<pre><code>% git push apache HEAD:master
+</code></pre>
+
+<h2 id="creating-a-gpg-key">Creating a GPG key</h2>
+
+<p>When you become a committer, you should create a 4096 bit GPG key.</p>
+
+<pre><code>% gpg --full-gen-key
+</code></pre>
+
+<p>Use 4096 bits and your Apache email address. Once it is created,
+you’ll need to get your key fingerprint. Avoid using the short
+fingerprint (eg. 3D0C92B9), because it is possible to generate fake
+keys that have the same short fingerprint as the real key.</p>
+
+<pre><code>% gpg --list-secret-keys --keyid-format LONG
+</code></pre>
+
+<p>Your key fingerprint is the string after “rsa4096/”. Example output
+for the key with fingerprint 1209E7F13D0C92B9 looks like:</p>
+
+<pre><code>/Users/owen/.gnupg/pubring.gpg
+------------------------------
+sec   rsa4096/1209E7F13D0C92B9 2010-02-23 [SC]
+      47660BC98BC433F01E5C90581209E7F13D0C92B9
+uid                 [ultimate] Owen O'Malley &lt;omal...@apache.org&gt;
+</code></pre>
+
+<p>Now publish your public key to one of the public keyservers. I usually use
+hkp://pgp.mit.edu, although any of them will work.</p>
+
+<pre><code>gpg --send-key &lt;your key fingerprint&gt;
+</code></pre>
+
+<p>Next, you need to update the <a href="https://id.apache.org";>Apache account
+database</a> with your new key. Login to add your
+new key’s fingerprint and your github id. It is also good to update
+your github profile with your GPG public key as well at
+<a 
href="https://github.com/settings/keys";>https://github.com/settings/keys</a>.</p>
+
+<p>After you’ve created your key, it is good to get someone in the ORC
+community to sign it for you. Contact someone directly or send email
+to d...@orc.apache.org asking for someone to sign it.</p>
+
 <h2 id="making-a-release">Making a Release</h2>
 
-<p>The process to make a release is documented <a 
href="/develop/make-release.html">here</a>.</p>
+<p>The release process for ORC is driven by a Release Manager. They should
+discuss their intention to start the process on the dev list and then
+follow the steps of <a href="make-release.html">how to release ORC</a>.</p>
+
+<h2 id="dist-directory">Dist Directory</h2>
+
+<p>Apache expects the projects to manage their current release artifact
+distribution using subversion. It should be limited to the latest
+release in each of the active release branches.</p>
+
+<p>The ORC dist directory is managed via
+<a 
href="https://dist.apache.org/repos/dist/release/orc";>https://dist.apache.org/repos/dist/release/orc</a>.
+The release artifacts are pushed to many mirrors. Files in the dist
+directory are available forever via the <a 
href="https://archive.apache.org/dist/orc/";>Apache dist
+archive</a>.</p>
+
+<h2 id="bylaws">Bylaws</h2>
+
+<p>ORC has a set of <a href="bylaws.html">bylaws</a> that describe the rules 
for the different
+votes within our project.</p>
 
       </article>
     </div>

http://git-wip-us.apache.org/repos/asf/orc/blob/74a2ad6f/develop/make-release.html
----------------------------------------------------------------------
diff --git a/develop/make-release.html b/develop/make-release.html
index ee3786b..e8354f8 100644
--- a/develop/make-release.html
+++ b/develop/make-release.html
@@ -2,7 +2,7 @@
 <html lang="en-US">
 <head>
   <meta charset="UTF-8">
-  <title>Making a Release</title>
+  <title>How To Release ORC</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <meta name="generator" content="Jekyll v2.4.0">
   <link rel="stylesheet" 
href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic,900">
@@ -83,7 +83,7 @@
 
     <div class="unit whole">
       <article>
-        <h1>Making a Release</h1>
+        <h1>How To Release ORC</h1>
         <h2 id="preparing-for-release">Preparing for release</h2>
 
 <p>Set version so that it isn’t a SNAPSHOT.</p>

Reply via email to