diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-08 00:30:24 +0800 |
|---|---|---|
| committer | xiaodong shang <shang.xiaodong@zte.com.cn> | 2016-09-07 16:38:04 +0000 |
| commit | 25f5fcf39276a4658179aa8a6477cb92a65a2a0d (patch) | |
| tree | 1c2d478290caccd23b382b70887f3bc4bc8f6b69 /tosca2heat/heat-translator/translator/tests/data/test_tosca_artifact.yaml | |
| parent | ab3d502d62346220a9ddb6432964fe14424267e3 (diff) | |
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)
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests/data/test_tosca_artifact.yaml')
0 files changed, 0 insertions, 0 deletions