From: julien zhang <zhang.jun3g@zte.com.cn>
Date: Fri, 8 Jul 2016 06:06:45 +0000 (+0000)
Subject: Merge "Affinity and anti-affinity translate to heat resource type"
X-Git-Tag: colorado.1.0~61
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=870d910efa510e768b19785ec677ddb731c49bb0;p=parser.git

Merge "Affinity and anti-affinity translate to heat resource type"
---

870d910efa510e768b19785ec677ddb731c49bb0