Merge pull request #38 from mattyb149/NIFI-7415
NIFI-7415: Add .asf.yaml to configure GitHub integrations
diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs
index a6a0fd7..0c59c1c 100644
--- a/src/pages/html/people.hbs
+++ b/src/pages/html/people.hbs
@@ -155,11 +155,6 @@
<td></td>
</tr>
<tr>
- <td>jstorck</td>
- <td>Jeff Storck</td>
- <td></td>
- </tr>
- <tr>
<td>phrocker</td>
<td>Marc Parisi</td>
<td></td>
@@ -173,12 +168,22 @@
<td>kdoran</td>
<td>Kevin Doran</td>
<td></td>
- </tr>
+ </tr>
<tr>
<td>pwicks</td>
<td>Peter Wicks</td>
<td></td>
</tr>
+ <tr>
+ <td>aboda</td>
+ <td>Arpad Boda</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>andrewmlim</td>
+ <td>Andrew M. Lim</td>
+ <td></td>
+ </tr>
</table>
</div>
</div>
@@ -230,11 +235,6 @@
<td></td>
</tr>
<tr>
- <td>andrewmlim</td>
- <td>Andrew M. Lim</td>
- <td></td>
- </tr>
- <tr>
<td>mhogue</td>
<td>Mike Hogue</td>
<td></td>
@@ -255,11 +255,6 @@
<td></td>
</tr>
<tr>
- <td>aboda</td>
- <td>Arpad Boda</td>
- <td></td>
- </tr>
- <tr>
<td>thenatog</td>
<td>Nathan Gough</td>
<td></td>
@@ -288,6 +283,27 @@
</div>
</div>
<div class="row">
+ <div class="large-12 columns">
+ <h3 class="nifi-txt">
+ <span>
+ In Memoriam
+ </span>
+ </h3>
+ </div>
+</div>
+<div class="row">
+ <div class="large-12 columns">
+<table>
+ <tr>
+ <th>Id</th>
+ <th>Name</th>
+ </tr>
+ <tr>
+ <td>jstorck</td>
+ <td>Jeff Storck (PMC)</td>
+ </tr>
+</table>
+<div class="row">
<div class="large-12 columns">
<h3 class="nifi-txt">
<span>
@@ -307,8 +323,8 @@
<td>bimargulies</td>
<td>Benson Margulies</td>
</tr>
- </table>
- </div>
+</table>
+</div>
</div>
<div class="row">
<div class="large-12 columns">
diff --git a/src/pages/html/security.hbs b/src/pages/html/security.hbs
index 21c010f..7d6ac51 100644
--- a/src/pages/html/security.hbs
+++ b/src/pages/html/security.hbs
@@ -19,8 +19,15 @@
<ul>
<li>Let us know as soon as possible upon discovery of a potential security issue, and we'll make every effort to quickly resolve the issue.</li>
<li>Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a third-party.</li>
- <li>Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our service. Only interact with accounts you own or with explicit
- permission of the account holder.
+ <li>Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our service. Only interact with accounts you own or with explicit permission of the account holder.</li>
+ <li>Please read the <a href="https://www.apache.org/security/committers.html" target="_blank">Apache Project Security for Committers policy</a> to understand the restrictions around disclosure of security issues in the Apache open source community.
+ <br/><br/>
+ Specifically, please <strong><em>do not</em></strong>:
+ <ul style="list-style-type:none;">
+ <li>⛔️ Open a Jira disclosing a security vulnerability to the public</li>
+ <li>⛔️ Send a message to the dev@nifi.apache.org or users@nifi.apache.org mailing lists disclosing a security vulnerability to the public</li>
+ <li>⛔️ Send a message to the Apache NiFi Slack instance disclosing a security vulnerability to the public</li>
+ </ul>
</li>
</ul>
<h3>Exclusions</h3>
