Alistair Coles ce0e16bcc5 Merge branch 'master' into feature/crypto ... Conflicts: swift/obj/server.py test/probe/test_object_async_update.py test/unit/obj/test_server.py Change-Id: Ifeba1cfe8c4244eff069ab10b2c77f8ea5e2a39b		2016-06-06 15:51:52 +01:00
..
manpages	Merge "Allow fallocate_reserve to be a percentage"	2016-05-12 08:18:39 +00:00
saio	Refactor server side copy as middleware	2016-05-11 14:55:51 -04:00
source	Merge branch 'master' into feature/crypto	2016-06-06 15:51:52 +01:00