Author: stsp
Date: Wed Aug 5 08:56:58 2015
New Revision: 1694152
URL: http://svn.apache.org/r1694152
Log:
* CHANGES (1.7.x): Merge outstanding changes from trunk.
Modified:
subversion/branches/1.7.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.7.x/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/CHANGES?rev=1694152&r1=1694151&r2=1694152&view=diff
==============================================================================
--- subversion/branches/1.7.x/CHANGES (original)
+++ subversion/branches/1.7.x/CHANGES Wed Aug 5 08:56:58 2015
@@ -1,6 +1,14 @@
+Version 1.7.22
+(12 Aug 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.22
+
+ Developer-visible changes:
+ - General:
+ * fix the regression test suite which was broken in 1.7.21 (r1694012)
+
Version 1.7.21
(5 Aug 2015, from /branches/1.7.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.8.21
+http://svn.apache.org/repos/asf/subversion/tags/1.7.21
User-visible changes:
- Client-side bugfixes:
Propchange: subversion/branches/1.7.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 5 08:56:58 2015
@@ -64,4 +64,4 @@
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
/subversion/branches/uris-as-urls/CHANGES:1060426-1064427
-/subversion/trunk/CHANGES:1145993-1692794
+/subversion/trunk/CHANGES:1145993-1694151
