Code Review / sdnvpn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: b36bffc 8b7a77c)
Merge "Fix quagga peering by working around the NAT" into stable/danube
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>
Tue, 14 Mar 2017 08:31:26 +0000 (08:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 14 Mar 2017 08:31:26 +0000 (08:31 +0000)
1  2 
sdnvpn/artifacts/quagga_setup.sh patch | diff1 | diff2 | blob | history
sdnvpn/test/functest/testcase_3.py patch | diff1 | diff2 | blob | history

diff --cc sdnvpn/artifacts/quagga_setup.sh
Simple merge
diff --cc sdnvpn/test/functest/testcase_3.py
Simple merge