Rohit Yadav 01d44347e7 Merge remote-tracking branch 'origin/4.19' ... Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: plugins/network-elements/juniper-contrail/pom.xml pom.xml tools/marvin/setup.py Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>		2024-03-21 18:38:01 +05:30
..
conf	Normalize loggers and upgrade log4j 1.2 to log4j 2.19 (#7131)	2024-02-08 09:55:41 -03:00
src	build: fix build failure after merge-forward	2024-03-20 14:07:42 +01:00
pom.xml	Merge remote-tracking branch 'origin/4.19'	2024-03-21 18:38:01 +05:30