Merge "Cinder fix"
authorMark Beierl <mark.beierl@emc.com>
Wed, 9 Mar 2016 14:55:49 +0000 (14:55 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 9 Mar 2016 14:55:49 +0000 (14:55 +0000)
commit56bee3e9541961e5d542d2c008b5420ff44bd185
tree6022da5f8244869de31e717f5dd2c7030525a2f2
parent588c94351caa067f25417af1f186d10c4904d7fe
parent5cedf955f643e3904182c6b0807912092f46e971
Merge "Cinder fix"