subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1565073 - in /subversion/branches/1.8.x: ./ STATUS subversion/svnserve/svnserve.c
Date Thu, 06 Feb 2014 05:10:00 GMT
Author: breser
Date: Thu Feb  6 05:09:59 2014
New Revision: 1565073

URL: http://svn.apache.org/r1565073
Log:
Merge r1563110 from trunk:

 * r1563110
   Correct the default cache size in svnserve's help text for the -M option.
   Justification:
     Help text is wrong.
   Votes:
     +1: philip, stefan2, breser

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/svnserve/svnserve.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1563110

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1565073&r1=1565072&r2=1565073&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Feb  6 05:09:59 2014
@@ -206,13 +206,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1563110
-   Correct the default cache size in svnserve's help text for the -M option.
-   Justification:
-     Help text is wrong.
-   Votes:
-     +1: philip, stefan2, breser
-
  * r1555499
    Release internal FS objects when closing a commit editor.
    Justification:

Modified: subversion/branches/1.8.x/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnserve/svnserve.c?rev=1565073&r1=1565072&r2=1565073&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnserve/svnserve.c (original)
+++ subversion/branches/1.8.x/subversion/svnserve/svnserve.c Thu Feb  6 05:09:59 2014
@@ -215,9 +215,7 @@ static const apr_getopt_option_t svnserv
         "                             "
         "minimize redundant operations.\n"
         "                             "
-        "Default is 128 for threaded and 16 for non-\n"
-        "                             "
-        "threaded mode.\n"
+        "Default is 16.\n"
         "                             "
         "[used for FSFS repositories only]")},
     {"cache-txdeltas", SVNSERVE_OPT_CACHE_TXDELTAS, 1,



Mime
View raw message