Tim Burke 5c564e5396 Merge branch 'master' into feature/deep ... Conflicts: swift/obj/updater.py test/unit/common/test_db_replicator.py test/unit/container/test_server.py Change-Id: I7997e882d5e04dfc9e6ff82d5e08890d5ec250da		2017-11-03 13:14:13 -07:00
..
account	Use check_drive consistently	2017-11-01 16:33:40 +00:00
cli	simple tool to display shard relationships	2017-10-23 15:04:29 +01:00
common	Merge branch 'master' into feature/deep	2017-11-03 13:14:13 -07:00
container	Merge branch 'master' into feature/deep	2017-11-03 13:14:13 -07:00
locale	Imported Translations from Zanata	2017-08-25 07:41:28 +00:00
obj	Merge branch 'master' into feature/deep	2017-11-03 13:14:13 -07:00
proxy	Merge branch 'master' into feature/deep	2017-11-03 13:14:13 -07:00
__init__.py	Make pbr a build-time only dependency	2013-10-29 12:29:49 -07:00