Emergence merged for unit test. 01/20601/1
authorshangxdy <shang.xiaodong@zte.com.cn>
Wed, 7 Sep 2016 16:30:24 +0000 (00:30 +0800)
committershangxdy <shang.xiaodong@zte.com.cn>
Wed, 7 Sep 2016 16:30:24 +0000 (00:30 +0800)
commit23f466831a8284433609e9f770737830d0b448bf
tree10c1d23a845026a0499b9a011b5ca30e3883de54
parentfa544e8fbbf3b8d5cfe0dc82090f0de6d7599524
Emergence merged for unit test.

Reversed merged caused the unit test error, i think this
is the ci system's bug.

Change-Id: I6d29f7f11cc0a78c695f179aa30c93545a575584
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml