Alistair Coles f9b7fd3074 Merge branch 'master' into feature/crypto ... Conflicts: swift/common/wsgi.py Change-Id: Ic37a285c008b01c7babf29110cfe0180bfde69c9		2016-01-26 10:54:03 +00:00
..
account	Python 3 deprecated the logger.warn method in favor of warning	2015-12-22 22:11:29 +05:30
cli	Merge "Show UTC time in swift-recon."	2016-01-15 06:03:21 +00:00
common	Merge branch 'master' into feature/crypto	2016-01-26 10:54:03 +00:00
container	Container-Sync to iterate only over synced containers	2016-01-06 16:46:31 +02:00
locale	Imported Translations from Zanata	2016-01-18 06:20:14 +00:00
obj	Merge "Validate X-Timestamps"	2016-01-22 05:50:01 +00:00
proxy	Merge branch 'master' into feature/crypto	2016-01-26 10:54:03 +00:00
__init__.py	Make pbr a build-time only dependency	2013-10-29 12:29:49 -07:00