tree fec28fb3dd52b0eeb597987824daa0d63f370728
parent 208752998e49c262fcb11a6ee2d3e69095f821f3
parent a286a1393add42e919eeae3e7e81f124deeccdd2
author Jenkins <jenkins@review.openstack.org> 1456913849 +0000
committer Gerrit Code Review <review@openstack.org> 1456913850 +0000

Merge "Fix test_encryption_vol_type to take admin creds from conf"