Alistair Coles 9045f33869 Merge at-rest encryption feature into master ... Co-Authored-By: Christian Cachin <cca@zurich.ibm.com> Co-Authored-By: Mahati Chamarthy <mahati.chamarthy@gmail.com> Co-Authored-By: Peter Chng <pchng@ca.ibm.com> Co-Authored-By: Tim Burke <tim.burke@gmail.com> Co-Authored-By: Thiago da Silva <thiago@redhat.com> Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com> Co-Authored-By: Jonathan Hinson <jlhinson@us.ibm.com> Co-Authored-By: Samuel Merritt <sam@swiftstack.com> Co-Authored-By: Janie Richling <jrichli@us.ibm.com> Co-Authored-By: Hamdi Roumani <roumani@ca.ibm.com> Co-Authored-By: Kota Tsuyuzaki <tsuyuzaki.kota@lab.ntt.co.jp> Change-Id: I1d8b030b9c8f81a232da5d6f93f442e46e331af2		2016-07-01 00:34:33 -07:00
..
account	Catch AttributeError less often	2016-06-14 16:10:16 -07:00
cli	swift-ring-builder --yes option	2016-05-31 17:11:13 +02:00
common	Merge at-rest encryption feature into master	2016-07-01 00:34:33 -07:00
container	Catch AttributeError less often	2016-06-14 16:10:16 -07:00
locale	Imported Translations from Zanata	2016-06-03 06:49:09 +00:00
obj	Merge at-rest encryption feature into master	2016-07-01 00:34:33 -07:00
proxy	Merge at-rest encryption feature into master	2016-07-01 00:34:33 -07:00
__init__.py	Make pbr a build-time only dependency	2013-10-29 12:29:49 -07:00