~ubuntu-branches/ubuntu/trusty/swift/trusty-updates

« back to all changes in this revision

Viewing changes to swift/common/memcached.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2013-08-13 10:37:13 UTC
  • mfrom: (1.2.21)
  • Revision ID: package-import@ubuntu.com-20130813103713-1ctbx4zifyljs2aq
Tags: 1.9.1-0ubuntu1
[ James Page ]
* d/control: Update VCS fields for new branch locations.

[ Chuck Short ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
import socket
50
50
import time
51
51
from bisect import bisect
 
52
from gettext import gettext as _
52
53
from hashlib import md5
53
54
 
54
55
from swift.common.utils import json
178
179
                        server, e, action='connecting', sock=sock)
179
180
 
180
181
    def _return_conn(self, server, fp, sock):
181
 
        """ Returns a server connection to the pool """
 
182
        """Returns a server connection to the pool."""
182
183
        self._client_cache[server].append((fp, sock))
183
184
 
184
185
    def set(self, key, value, serialize=True, timeout=0, time=0,