Author: sijskes
Date: Sat Dec 17 11:46:12 2011
New Revision: 800395
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 Sat Dec 17 11:46:12 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-799178
+/websites/staging/river/trunk:778669-800394
Modified: websites/production/river/content/ci.html
==============================================================================
--- websites/production/river/content/ci.html (original)
+++ websites/production/river/content/ci.html Sat Dec 17 11:46:12 2011
@@ -66,8 +66,8 @@
<tr>
<td style="overflow: hidden;" valign="top" width="100%">
<div class="wiki-content">
-<p>In order to find problems early, river uses 'Continuous Integration'. </p>
-<p>This is implemented on the Apache Hudson server.</p>
+<p>In order to find problems early, river uses <a
href="http://en.wikipedia.org/wiki/Continuous_integration";>Continuous
Integration</a>. </p>
+<p>After changes the builds are scheduled on the <a
href="https://builds.apache.org/";>Apache build server</a>.</p>
<p>The following jobs are used:</p>
<table>
<thead>
@@ -122,7 +122,7 @@
<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:
-<a
href="https://hudson.apache.org/hudson/view/M-R/view/River/";>https://hudson.apache.org/hudson/view/M-R/view/River/</a></p>
+<a
href="https://builds.apache.org/view/M-R/view/River/";>https://builds.apache.org/view/M-R/view/River/</a></p>
</div>
</td>
<td valign="top">
