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

author qi liang <liangqi1@huawei.com>

Fri, 25 Mar 2016 13:59:57 +0000 (13:59 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 25 Mar 2016 13:59:57 +0000 (13:59 +0000)
author qi liang <liangqi1@huawei.com>
Fri, 25 Mar 2016 13:59:57 +0000 (13:59 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 25 Mar 2016 13:59:57 +0000 (13:59 +0000)
diff --cc docs/userguide/architecture.rst

index de52bbb,b03ba6d..800e822

mode 100644,100755..100755
--- 1/docs/userguide/architecture.rst
--- 2/docs/userguide/architecture.rst
+++ b/docs/userguide/architecture.rst
author	qi liang <liangqi1@huawei.com>
	Fri, 25 Mar 2016 13:59:57 +0000 (13:59 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 25 Mar 2016 13:59:57 +0000 (13:59 +0000)