Merge "Upgrade OpenStack version from Pike to Queens"
authorHarry Huang <huangxiangyu5@huawei.com>
Thu, 10 May 2018 08:46:11 +0000 (08:46 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 10 May 2018 08:46:11 +0000 (08:46 +0000)
1  2 
deploy/conf/cluster.conf

Simple merge