svn commit: r1003605 - /subversion/branches/1.6.x/CHANGES

[hw...@apache.org]

Author: hwright
Date: Fri Oct  1 18:10:28 2010
New Revision: 1003605

URL: http://svn.apache.org/viewvc?rev=1003605&view=rev
Log:
* CHANGES:
  Merge changes from trunk.

Modified:
    subversion/branches/1.6.x/CHANGES   (contents, props changed)

Modified: subversion/branches/1.6.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/CHANGES?rev=1003605&r1=1003604&r2=1003605&view=diff
==============================================================================
--- subversion/branches/1.6.x/CHANGES (original)
+++ subversion/branches/1.6.x/CHANGES Fri Oct  1 18:10:28 2010
@@ -19,9 +19,11 @@ http://svn.apache.org/repos/asf/subversi
    * fix error transmission problems in svnserve (r997457, -66)
    * fixed: record-only merges create self-referential mergeinfo (issue #3646)
    * fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695)
+            See CVE-2010-3315, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2010-3315-advisory.txt
    * make 'svnmucc propset' handle existing and non-existing URLs (r1000607)
    * add new 'propsetf' subcommand to svnmucc (r1000612)
-   * emit a warning about copied dirs during ci with limited depth (r1002094)
+   * warn about copied dirs during 'svn ci' with limited depth (r1002094)
 
   Developer-visible changes:
    * make ruby bindings compatible with Ruby 1.9 (r957507)

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  1 18:10:28 2010
@@ -91,4 +91,4 @@
 /subversion/branches/tc_url_rev/CHANGES:874351-874483
 /subversion/branches/tree-conflicts/CHANGES:868291-873154
 /subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-1002798
+/subversion/trunk/CHANGES:837701-841355,875962-1003604