← Back to branch summary

~wallyworld/goose/rate-limit-retry-tests

~wallyworld/goose/rate-limit-retry-tests

Viewing all changes in revision 55.

Committer: Ian Booth
Date: 2013-01-29 00:52:25 UTC
mfrom: (53.1.1 control-test-doubles)
Revision ID: ian.booth@canonical.com-20130129005225-b5yvc0f0myko0ziw

Merge upstream and resolve conflicts

files renamed:
testservices/openstack/ => testservices/openstackservice/

files modified:
client/local_test.go

nova/local_test.go

swift/local_test.go

testservices/openstackservice/openstack.go

testservices/service.go

testservices/service_test.go

tools/secgroup-delete-all/main_test.go

Show diffs side-by-side

added added

removed removed

client/local_test.go

nova/local_test.go

swift/local_test.go

testservices/openstackservice/openstack.go

testservices/service.go

testservices/service_test.go

tools/secgroup-delete-all/main_test.go

Older »