From: qi liang <liangqi1@huawei.com>
Date: Fri, 25 Mar 2016 13:59:57 +0000 (+0000)
Subject: Merge "Deployment View part of SWA" into stable/brahmaputra
X-Git-Tag: brahmaputra.2.0~4
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3f9a8ea7b2c35b1298e7d318b0d7c687dfa5aabe;p=yardstick.git

Merge "Deployment View part of SWA" into stable/brahmaputra
---

3f9a8ea7b2c35b1298e7d318b0d7c687dfa5aabe
diff --cc docs/userguide/architecture.rst
index de52bbb3a,b03ba6dd5..800e82224
mode 100644,100755..100755
--- a/docs/userguide/architecture.rst
+++ b/docs/userguide/architecture.rst