[openssl-commits] [web] master update

Richard Levitte levitte at openssl.org
Sat Oct 7 07:58:29 UTC 2017


The branch master has been updated
  discards  88aef9a68f53ecf210a7d16da4c0e39b2b4533f8 (commit)
  discards  a139e964281e6e1a8812fd67519a4a4259f67280 (commit)
  discards  8ddda0cff5b5ce2335f3b14d6965e867ebb7e404 (commit)
  discards  e8c340517d8e4101f1f603ae45fd2729419229a8 (commit)
  discards  2538f9a49ea519314ff632c03534b80d0d833ec4 (commit)
  discards  d52870498d5febbc80c086272bf3535f9acae7de (commit)
  discards  8f075e2b722f92953b7c2f6a584544d3bea7038c (commit)
  discards  a10a0720ff422eb96e9fd282d86926623e77c759 (commit)
       via  c0f4890dd229ec70ee856ce2441da0074dcd305d (commit)
       via  659b7f6b1433df08d04b8b97e7ced469a9393fab (commit)
       via  bb7b7a5a2c34d0db5788dc92e4f7f7c5d44251ec (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (88aef9a68f53ecf210a7d16da4c0e39b2b4533f8)
            \
             N -- N -- N (c0f4890dd229ec70ee856ce2441da0074dcd305d)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.


- Log -----------------------------------------------------------------
commit c0f4890dd229ec70ee856ce2441da0074dcd305d
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Oct 3 14:55:32 2017 -0400

    Eric/Tim acknowledgement not needed for the website
    
    It's in the license of the source distributions.

commit 659b7f6b1433df08d04b8b97e7ced469a9393fab
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Oct 7 09:53:25 2017 +0200

    OMC page: remove alumni, refer to alumni page
    
    Also, remove italics.  There's is no "core team" any more.

commit bb7b7a5a2c34d0db5788dc92e4f7f7c5d44251ec
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Oct 3 09:34:30 2017 +0200

    OMC Alumni page
    
    Note: currently not linked from anywhere, only made available for
    internal viewing.  As soon as approved, omc.html will be edited
    accordingly.

-----------------------------------------------------------------------

Summary of changes:
 community/omc-alumni.html |  3 +-
 community/omc.html        | 78 +++++++++++------------------------------------
 2 files changed, 19 insertions(+), 62 deletions(-)

diff --git a/community/omc-alumni.html b/community/omc-alumni.html
index eefa0fa..6349dea 100644
--- a/community/omc-alumni.html
+++ b/community/omc-alumni.html
@@ -13,7 +13,8 @@
 	    <div class="entry-content">
 	      <p>
 		We gratefully acknowledge the contributions of the
-		following OMC Alumni:
+		following alumni (who were previously in the OMC, or a
+		team member or founder prior to creation of the OMC):
 	      </p>
 	      <table summary="OMC Alumni">
 		<tr>
diff --git a/community/omc.html b/community/omc.html
index e16e4f7..0c26011 100644
--- a/community/omc.html
+++ b/community/omc.html
@@ -37,7 +37,7 @@
             </tr>
 
             <tr>
-              <td><em>Mark J. Cox</em></td>
+              <td>Mark J. Cox</td>
               <td><a href="mailto:mark at openssl.org">mark at openssl.org</a></td>
               <td>UK</td>
               <td><a
@@ -52,7 +52,7 @@
             </tr>
 
             <tr>
-              <td><em>Dr. Stephen Henson</em></td>
+              <td>Dr. Stephen Henson</td>
               <td><a href="mailto:steve at openssl.org">steve at openssl.org</a></td>
               <td>UK</td>
               <td><a
@@ -68,14 +68,6 @@
             </tr>
 
 	    <tr>
-	      <td>Lutz Jänicke (I)</td>
-	      <td><a href="mailto:jaenicke at openssl.org">jaenicke at openssl.org</a></td>
-	      <td>DE</td>
-	      <td><a
-		  href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0x0A77335AADE74E6BB36CAD8ADFAB592ABDD52F1C">0A77 335A ADE7 4E6B B36C AD8A DFAB 592A BDD5 2F1C</a></td>
-	    </tr>
-
-	    <tr>
 	      <td>Emilia Käsper</td>
 	      <td><a href="mailto:emilia at openssl.org">emilia at openssl.org</a></td>
 	      <td>CH</td>
@@ -83,14 +75,6 @@
 	    </tr>
 
             <tr>
-              <td><em>Ben Laurie</em> (I)</td>
-              <td><a href="mailto:ben at openssl.org">ben at openssl.org</a></td>
-              <td>UK</td>
-              <td><a
-                  href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0x765655DE62E396FF2587EB6C4F6DE1562118CF83">7656 55DE 62E3 96FF 2587 EB6C 4F6D E156 2118 CF83</a></td>
-            </tr>
-
-            <tr>
               <td>Steve Marquess</td>
               <td><a
                   href="mailto:marquess at openssl.org">marquess at openssl.org</a>  </td>
@@ -108,22 +92,6 @@
             </tr>
 
             <tr>
-              <td>Bodo Möller (I)</td>
-              <td><a href="mailto:bodo at openssl.org">bodo at openssl.org</a></td>
-              <td>CH</td>
-              <td><a
-                  href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0xAA589DAC5A6A9B85">C7 AC 7E AD 56 6A 65 EC F6 16 66 83 7E 86 68 28</a></td>
-            </tr>
-
-            <tr>
-              <td>Andy Polyakov (I)</td>
-              <td><a href="mailto:appro at openssl.org">appro at openssl.org</a></td>
-              <td>SE</td>
-              <td><a
-                  href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0xB652F27F2B8D1B8DA78D7061BA6CDA461FE8E023">B652 F27F 2B8D 1B8D A78D 7061 BA6C DA46 1FE8 E023</a></td>
-            </tr>
-
-            <tr>
               <td>Kurt Roeckx</td>
               <td><a href="mailto:kurt at openssl.org">kurt at openssl.org</a></td>
               <td>BE</td>
@@ -139,39 +107,27 @@
                   href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0xD099684DC7C21E02E14A8AFEF23479455C51B27C">D099 684D C7C2 1E02 E14A 8AFE F234 7945 5C51 B27C</a></td>
             </tr>
 
-            <tr>
-              <td>Geoff Thorpe (I)</td>
-              <td><a href="mailto:geoff at openssl.org">geoff at openssl.org</a></td>
-              <td>QC</td>
-              <td><a
-                  href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&search=0x1B3DF808C221D2A5ED74172F0833F510E18C1C32">1B3D F808 C221 D2A5 ED74 172F 0833 F510 E18C 1C32</a></td>
-            </tr>
-
 	  </table>
-          Names in <em>italics</em> are founding members of the OpenSSL project.
           Names with an (I) are currently inactive as defined in our
           <a href="/policies/bylaws.html">bylaws</a>.
 
 	  <p>
 	  In addition, we gratefully acknowledge the contributions of the
-          following alumni: <em>Ralf S. Engelschall</em>,
-          Nils Larsch, Holger Reif, and
-	  Paul C. Sutton.  We also respectfully remember Ulf Möller who
-	  is no longer with us.
+	  <a href="omc-alumni.html">OMC Alumni</a>.
 	  </p>
-	  </div>
-
-	  <footer>
-	    You are here: <a href="/">Home</a>
-	    : <a href=".">Community</a>
-	    : <a href="">OMC</a>
-	    <br/><a href="/sitemap.txt">Sitemap</a>
-	  </footer>
-	</article>
-      </div>
-      <!--#include virtual="sidebar.shtml" -->
+	</div>
+
+	<footer>
+	  You are here: <a href="/">Home</a>
+	  : <a href=".">Community</a>
+	  : <a href="">OMC</a>
+	  <br/><a href="/sitemap.txt">Sitemap</a>
+	</footer>
+      </article>
     </div>
+    <!--#include virtual="sidebar.shtml" -->
   </div>
-  <!--#include virtual="/inc/footer.shtml" -->
-  </body>
-  </html>
+</div>
+<!--#include virtual="/inc/footer.shtml" -->
+</body>
+</html>


More information about the openssl-commits mailing list