Merge "Fixes sdnvpn (again)" into stable/colorado
authorTim Rozet <trozet@redhat.com>
Fri, 7 Oct 2016 14:05:55 +0000 (14:05 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 7 Oct 2016 14:05:55 +0000 (14:05 +0000)
commit9fc4054fad9a18ad49f53ef10f407248fec237c5
tree467c4361e986a5b090465b7b91de3be3ba0a49d5
parent2dabfaeb745dc538adcc7d60961f32ffdcc46369
parent8a8a7c87eb5667867e982956124a0af5a0aad003
Merge "Fixes sdnvpn (again)" into stable/colorado