Author: julianfoad
Date: Mon Sep 24 15:55:20 2018
New Revision: 1841868
URL: http://svn.apache.org/viewvc?rev=1841868&view=rev
Log:
* CHANGES: Merge recent change from trunk.
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/CHANGES
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 24 15:55:20 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841731,1841736,1841743,1841753-1841754,1841822
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841731,1841736,1841743,1841753-1841754,1841822,1841867
Modified: subversion/branches/1.11.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/CHANGES?rev=1841868&r1=1841867&r2=1841868&view=diff
==============================================================================
--- subversion/branches/1.11.x/CHANGES (original)
+++ subversion/branches/1.11.x/CHANGES Mon Sep 24 15:55:20 2018
@@ -1,12 +1,12 @@
Version 1.11.0
-(17 Oct 2018, from /branches/1.11.x)
+(24 Oct 2018, from /branches/1.11.x)
http://svn.apache.org/repos/asf/subversion/tags/1.11.0
User-visible changes:
- Major new features:
* Shelving is no longer based on patch files (experimental) (issue #3625)
* Checkpointing (experimental) (issue #3626)
- * Viewspec output command (experimental) (r1826864)
+ * Viewspec output command (experimental) (issue #4753)
- Minor new features and improvements:
* Improvements to tree conflict resolution (issue #4694 #4766 ...)
@@ -43,6 +43,7 @@ http://svn.apache.org/repos/asf/subversi
* Fix Python binding fs.FileDiff behaviour with python-future (r1823802)
* Fix Python unit test, fs.SubversionFSTestCase, on Windows (r1824410)
* Bump minimum JDK version required for JavaHL to 1.8 (r1831895)
+ * Enable building against Java 10 (r1841180 et al)
* Fix a potential crash in JavaHL (issue #4764)
