Merge branch 'master' into v7.0 60/8560/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 4 Feb 2020 21:13:26 +0000 (22:13 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 4 Feb 2020 21:14:24 +0000 (22:14 +0100)
commit2b0f0c38f4f73071d8aaa600e337cbdaaabad51f
tree45f68b008064d614b3508def64807718aab3d085
parent338f5c1518fa2bb62dc396cb224d4223023ae312
parentc491f45073a16a40452d9278a0e4f19d10b4ff19
Merge branch 'master' into v7.0

* c491f45 (origin/master, origin/HEAD, master) fix 1005 adding SDN onos_vpls to RO packages
* 7bcadc5 install_osm: fix RELEASE, REPOSITORY and DOCKER_TAG vars
* 25e87d2 install_osm.sh: clean deb repos, but do not remove packages
* ae0784f Remove the old osm package at install time
* d7b6ab0 Bug 873 - Robot Automation improvement: Verify NS Instance updated as per changes in osmclient

Change-Id: I8b65de5e0d0628568de626e09d5c22ed4d135ebb
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>