svn commit: r1302038 - /subversion/branches/1.7.x/CHANGES

[da...@apache.org]

Author: danielsh
Date: Sat Mar 17 23:53:21 2012
New Revision: 1302038

URL: http://svn.apache.org/viewvc?rev=1302038&view=rev
Log:
On the 1.7.x branch, merge 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=1302038&r1=1302037&r2=1302038&view=diff
==============================================================================
--- subversion/branches/1.7.x/CHANGES (original)
+++ subversion/branches/1.7.x/CHANGES Sat Mar 17 23:53:21 2012
@@ -340,6 +340,25 @@ the 1.6 release:  http://subversion.apac
     * fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
 
 
+Version 1.6.18
+(?? Mar 2012, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.18
+
+  User-visible changes:
+    * reject invalid svn:mergeinfo at commit time over DAV (issue #3953) 
+    * fix reintegrate merge regression introduced in 1.6.13 (issue #3957)
+    * make the stderr output of the post-commit hook XML-safe (r893478)
+    * fix a rare source of FSFS corruption (r1240752)
+    * plug a memory leak in the bdb backend (r1205726)
+    * server-side performance fix for "log -g" (r1152282)
+    * fix description of svndumpfilter's --targets option (r1151911)
+
+  Developer-visible changes:
+    * fix sqlite distfile retrieval in get-deps.sh (r1134734)
+    * fix swig-py memory leak (r1235264, -296, -302, -736)
+    * allow passing --with-jdk to gen-make.py on Windows (r966167)
+
+
 Version 1.6.17
 (01 Jun 2011, from /branches/1.6.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.6.17

Propchange: subversion/branches/1.7.x/CHANGES
------------------------------------------------------------------------------
  Merged /subversion/trunk/CHANGES:r1295708-1302037