Code Review / compass4nfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 41006b9 f229198)
Merge "Fix some hard coding for some ip assignments"
authorYifei Xue <xueyifei@huawei.com>
Tue, 6 Feb 2018 01:54:03 +0000 (01:54 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 6 Feb 2018 01:54:03 +0000 (01:54 +0000)
1  2 
deploy/conf/compass.conf patch | diff1 | diff2 | blob | history
deploy/conf/virtual.conf patch | diff1 | diff2 | blob | history

diff --cc deploy/conf/compass.conf
Simple merge
diff --cc deploy/conf/virtual.conf
Simple merge