Merge "Add scale out TCs with availability zone support"

author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>

Thu, 21 Jun 2018 13:06:26 +0000 (13:06 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 21 Jun 2018 13:06:26 +0000 (13:06 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Thu, 21 Jun 2018 13:06:26 +0000 (13:06 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 21 Jun 2018 13:06:26 +0000 (13:06 +0000)
diff --cc docs/testing/user/userguide/14-nsb-operation.rst
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Thu, 21 Jun 2018 13:06:26 +0000 (13:06 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 21 Jun 2018 13:06:26 +0000 (13:06 +0000)