Author: julianfoad
Date: Fri Jan 4 21:47:53 2019
New Revision: 1850440
URL: http://svn.apache.org/viewvc?rev=1850440&view=rev
Log:
Merge from 'staging' to 'publish' (adds the upcoming changes list).
Added:
subversion/site/publish/upcoming.part.html
- copied unchanged from r1850439,
subversion/site/staging/upcoming.part.html
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/release-notes/index.html
subversion/site/publish/index.html (props changed)
subversion/site/publish/news.html (props changed)
subversion/site/publish/roadmap.html (props changed)
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 21:47:53 2019
@@ -1 +1 @@
-/subversion/site/staging:1812683-1846300
+/subversion/site/staging:1812683-1850439
Modified: subversion/site/publish/docs/release-notes/index.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/index.html?rev=1850440&r1=1850439&r2=1850440&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/index.html (original)
+++ subversion/site/publish/docs/release-notes/index.html Fri Jan 4 21:47:53
2019
@@ -71,6 +71,26 @@ official support status for the various
<p>For a detailed history of every release, please see
<a href="release-history.html">release history</a>.</p>
+<div class="h3" id="upcoming-patch-release">
+<h3>Coming up in the next patch release
+ <a class="sectionlink" href="#upcoming-patch-release"
+ title="Link to this section">¶</a>
+</h3>
+
+<p>These are the changes that have been merged to the 1.11.x branch since the
last 1.11.x patch release.</p>
+
+<p>These changes are almost certainly going to be in the next 1.11.x patch
release; any of them <i>may</i> be reverted before the release is made, but
they probably won't be. More changes besides these may be added.</p>
+
+<p>Further changes currently nominated for backport are listed in <a
href="http://svn.apache.org/repos/asf/subversion/branches/1.11.x/STATUS";>1.11.x/STATUS</a>
along with their current voting status. These may get in to the next release
if they reach the 'Approved' category in time.</p>
+
+<p>See also <a
href="http://svn.apache.org/repos/asf/subversion/trunk/CHANGES";>trunk/CHANGES</a>,
where all significant-enough changes will summarized for each version by the
time it is released.</p>
+
+<p>Different lists of changes are queued for older supported release lines
(1.10.x, 1.9.x), not shown here.</p>
+
+<!--#include virtual="/upcoming.part.html" -->
+
+</div> <!-- #upcoming-patch-release -->
+
</div> <!-- #release-notes -->
<div class="h2" id="supported-versions">
Propchange: subversion/site/publish/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 21:47:53 2019
@@ -1 +1 @@
-/subversion/site/staging/index.html:1812681-1845285
+/subversion/site/staging/index.html:1812681-1850439
Propchange: subversion/site/publish/news.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 21:47:53 2019
@@ -1 +1 @@
-/subversion/site/staging/news.html:1812681-1845285
+/subversion/site/staging/news.html:1812681-1850439
Propchange: subversion/site/publish/roadmap.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 21:47:53 2019
@@ -1 +1 @@
-/subversion/site/staging/roadmap.html:1812681-1845285
+/subversion/site/staging/roadmap.html:1812681-1850439
