2 Commits (d7699672a8b3fa078b8a5a681ef04121bc6a681a)

Author	SHA1	Message	Date
James Saint-Rossy	32f6ef7747	Merged with Upstream Master	2016-08-17 12:00:36 -04:00
Sébastien Han	673f54a100	osd: fix collocation spelling and declare dmcrypt variables ... * changed s/colocation/collocation/ * declare dmcrypt variable in ceph-common so the variables check does not fail Signed-off-by: Sébastien Han <seb@redhat.com>	2016-08-10 10:34:23 +02:00