Emergence merged for unit test. 03/20603/1
authorshangxdy <shang.xiaodong@zte.com.cn>
Wed, 7 Sep 2016 16:30:24 +0000 (00:30 +0800)
committerxiaodong shang <shang.xiaodong@zte.com.cn>
Wed, 7 Sep 2016 16:38:04 +0000 (16:38 +0000)
commit25f5fcf39276a4658179aa8a6477cb92a65a2a0d
tree1c2d478290caccd23b382b70887f3bc4bc8f6b69
parentab3d502d62346220a9ddb6432964fe14424267e3
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>
(cherry picked from commit 23f466831a8284433609e9f770737830d0b448bf)
tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml