svn commit: r802955 - in /websites/production/river: ./ content/ci.html

[si...@apache.org]

Author: sijskes
Date: Fri Jan 20 10:16:16 2012
New Revision: 802955

Log:
Publishing merge to river site by sijskes

Modified:
    websites/production/river/   (props changed)
    websites/production/river/content/ci.html

Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 10:16:16 2012
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-802654
+/websites/staging/river/trunk:778669-802954

Modified: websites/production/river/content/ci.html
==============================================================================
--- websites/production/river/content/ci.html (original)
+++ websites/production/river/content/ci.html Fri Jan 20 10:16:16 2012
@@ -82,24 +82,8 @@
 <td>Builds the trunk, and find errors during compilation</td>
 </tr>
 <tr>
-<td>River-trunk-QA-freebsd</td>
-<td>Build trunk and run QA tests under freebsd</td>
-</tr>
-<tr>
-<td>River-trunk-QA-osx</td>
-<td>Build trunk and run QA tests under OS X</td>
-</tr>
-<tr>
-<td>River-trunk-QA-solaris</td>
-<td>Build trunk and run QA tests under Solaris</td>
-</tr>
-<tr>
-<td>River-trunk-QA-ubuntu</td>
-<td>Build trunk and run QA tests under Ubuntu</td>
-</tr>
-<tr>
-<td>River-trunk-QA-windows</td>
-<td>Build trunk and run QA tests under Windows</td>
+<td>River-QA-*</td>
+<td>Build trunk and run QA tests</td>
 </tr>
 <tr>
 <td>River-verify</td>
@@ -110,15 +94,15 @@
 <td />
 </tr>
 <tr>
-<td>River-QA</td>
-<td />
-</tr>
-<tr>
 <td>River-QA-Runtime</td>
 <td />
 </tr>
 </tbody>
 </table>
+<p>The naming scheme used is:</p>
+<p>River-QA-[platformid]-[jdkid] [-branchid]</p>
+<p>The current platforms are: Solaris, Ubuntu, Windows</p>
+<p>The current jdkids are: jdk6 jdk7</p>
 <p>The River-trunk-QA-* jobs, build the river-runtime and the river-qa, 
 and tests the river-runtime with the river-qa framework.</p>
 <p>For their current status, see: