Author: sijskes
Date: Mon Feb 14 16:36:31 2011
New Revision: 785416
Log:
Publishing merge to river site by sijskes
Added:
websites/production/river/content/ci.html
- copied unchanged from r785415,
websites/staging/river/trunk/content/ci.html
Modified:
websites/production/river/ (props changed)
websites/production/river/content/development-process.html
websites/production/river/content/roadmap.html
websites/production/river/content/sitemap.html
Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 14 16:36:31 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-785318
+/websites/staging/river/trunk:778669-785415
Modified: websites/production/river/content/development-process.html
==============================================================================
--- websites/production/river/content/development-process.html (original)
+++ websites/production/river/content/development-process.html Mon Feb 14
16:36:31 2011
@@ -82,7 +82,7 @@
</div>
<h1 id="river_development_process">River Development Process</h1>
<h2 id="river_build_server">River build server</h2>
-<p>River is built on the Apache Hudson server. The projects can be found <a
href="https://hudson.apache.org/hudson/view/M-R/view/River/";>here</a>.</p>
+<p>River is built on the Apache Hudson server. The projects can be found <a
href="https://hudson.apache.org/hudson/view/M-R/view/River/";>here</a>. More on
this process: <a href="ci.html">Continuous Integration</a></p>
<h2 id="tracking_issues_and_changes">Tracking issues and changes</h2>
<ul>
<li>
Modified: websites/production/river/content/roadmap.html
==============================================================================
--- websites/production/river/content/roadmap.html (original)
+++ websites/production/river/content/roadmap.html Mon Feb 14 16:36:31 2011
@@ -68,9 +68,8 @@
<div class="wiki-content">
<h1 id="roadmap">Roadmap</h1>
<ul>
-<li>Gruadation as top level project river.apache.org</li>
<li>rename com.sun namespace to org.apache.river</li>
-<li>modular build & JDK policy</li>
+<li>modular build </li>
</ul>
</div>
</td>
Modified: websites/production/river/content/sitemap.html
==============================================================================
--- websites/production/river/content/sitemap.html (original)
+++ websites/production/river/content/sitemap.html Mon Feb 14 16:36:31 2011
@@ -70,6 +70,7 @@
<li><a href="/about.html">About Apache River</a></li>
<li><a href="/building-a-release.html">Building a release</a></li>
<li><a href="/building-river.html">Building River</a></li>
+<li><a href="/ci.html">Continuous Integration</a></li>
<li><a href="/coding.html">Coding conventions</a></li>
<li><a href="/concepts.html">River concepts</a></li>
<li><a href="/development-process.html">Development Process</a></li>
