tree 99a3c76eeef27d80219e38d06b8022b6bbb1a4a5
parent 8c0466f20162af764aa28090516fed28518f2850
parent ed13d4a2dc14a99b38075694055e53189d0bcc1e
author Jenkins <jenkins@review.openstack.org> 1387041236 +0000
committer Gerrit Code Review <review@openstack.org> 1387041236 +0000

Merge "Add whitelist entry for s-proxy 'Timeout talking to memcached'"