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
..
functional	Merge at-rest encryption feature into master	2016-07-01 00:34:33 -07:00
probe	Enable object body and metadata encryption	2016-06-30 23:31:15 -07:00
unit	Merge at-rest encryption feature into master	2016-07-01 00:34:33 -07:00
__init__.py	test/(functional/probe):Replace python print operator with print function (pep H233, py33)	2015-08-20 11:42:58 +09:00
sample.conf	Merge "Add a note for functional tests with Keystone."	2016-03-18 05:08:10 +00:00