Merge branch 'contrail' into v7.0 95/8995/2 v7.1.0rc5
authortierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 28 May 2020 16:07:06 +0000 (16:07 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 28 May 2020 16:07:47 +0000 (16:07 +0000)
commit2b9adea1c01414b2522ffc9fe1fd187c374ffdf8
tree1984999c45989aae851aa5ba1225662e049623ca
parent3c60222b41913257d53cac849cbcb173692124e4
parent4f4ce1725a3fef7c8e2074a1f8dc4e1979217f97
Merge branch 'contrail' into v7.0

Change-Id: I25cc61d45ac002c43875c610d34ac79e1d84457f
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>