Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1391747 - in /subversion/branches/1.7.x: ./ STATUS
 subversion/libsvn_subr/cache-memcache.c
Date: Sat, 29 Sep 2012 04:02:18 -0000
To: commits@subversion.apache.org
From: svn-role@apache.org
Message-Id: <20120929040218.D796F2388A9B@eris.apache.org>

Author: svn-role
Date: Sat Sep 29 04:02:18 2012
New Revision: 1391747

URL: http://svn.apache.org/viewvc?rev=1391747&view=rev
Log:
Merge r1391641 from trunk:

 * r1391641
   Convert cache time-to-live value from seconds to microseconds, which is
   the unit expected by the API.  (An API doc error in the past was the
   likely cause of this problem.)
   Justification:
     50 microseconds really isn't a sufficient lifespan for ... anything.
   Votes:
     +1: cmpilato, rhuijben, brane

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_subr/cache-memcache.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1391641

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1391747&r1=1391746&r2=1391747&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Sep 29 04:02:18 2012
@@ -146,15 +146,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1391641
-   Convert cache time-to-live value from seconds to microseconds, which is
-   the unit expected by the API.  (An API doc error in the past was the
-   likely cause of this problem.)
-   Justification:
-     50 microseconds really isn't a sufficient lifespan for ... anything.
-   Votes:
-     +1: cmpilato, rhuijben, brane
-
  * r1389928
    Fix a 1.7.x test to pass within a format 30 working copy.
    Justification:

Modified: subversion/branches/1.7.x/subversion/libsvn_subr/cache-memcache.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/cache-memcache.c?rev=1391747&r1=1391746&r2=1391747&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/cache-memcache.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/cache-memcache.c Sat Sep 29 04:02:18 2012
@@ -459,7 +459,7 @@ add_memcache_server(const char *name,
                                        0,  /* min connections */
                                        5,  /* soft max connections */
                                        10, /* hard max connections */
-                                       50, /* connection time to live (secs) */
+                                       apr_time_from_sec(50), /* ttl (ms) */
                                        &server);
   if (apr_err != APR_SUCCESS)
     {