Updated openstack/openstack
Project: openstack/swift  2998e96b9dbfa22b06062b66fb9809f8cdf05aa4
null
update setup.py with pbr version

This file is normally updated in the standard "update from
global requirements" patch, but since those contain other
changes we don't want, the setup.py file never gets updated.

This patch updates setup.py to bring it in line with the
standard global requirements way of doing things without also
updating [test-]requirements.txt

Change-Id: Id0e4f8e17dd4c714b4d2dd75985431a9e12e6a4f
Updated openstack/openstack
Project: openstack/swift  62087ab0517a9bb38691e73cea2cb3a386eb7d81
null
Update callback with proper bytes transferred

The first set of bytes transferred was being dropped.

Change-Id: I8e055190d04af1718c5e88bf5e8c44fde6794c74
Updated openstack/openstack
Project: openstack/swift  8d4a2e94ec83a863f78f0b3df6821cfecb6c25f3
null
Attempt to ensure connect always timesout

It seems that the test_connect_put_timeout() test does not always fail
when it is expected. Sometimes, not very often, the attempt to connect
succeeds, resulting in a failed test.

This might be because the fake-connection infrastructure uses a
sleep(0.1) and the test uses a connect timeout of 0.1. There might be a
case where the two values result in the exact time where the entries
happen to be added in the wrong order such that the sleep() completes
first before the connect timeout fires, where the connect completes
successfully.

Closes bug 1302781

Change-Id: Ie23e40cf294170eccdf0713e313f9a31a92f9071