Merge "Affinity and anti-affinity translate to heat resource type"
authorjulien zhang <zhang.jun3g@zte.com.cn>
Fri, 8 Jul 2016 06:06:45 +0000 (06:06 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 8 Jul 2016 06:06:46 +0000 (06:06 +0000)

Trivial merge