Rohit Yadav db31e67d51 Merge remote-tracking branch 'origin/4.15' into main ... Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: ui/src/utils/plugins.js ui/src/views/AutogenView.vue ui/tests/mockData/ActionButton.mock.json ui/tests/unit/views/compute/MigrateWizard.spec.js		2021-07-30 15:00:09 +05:30
..
compute	Merge remote-tracking branch 'origin/4.15' into main	2021-07-30 15:00:09 +05:30
AutogenView.spec.js	[TEST] - Test unit - Fix failing UI unit test 4.15 branch (#5219)	2021-07-30 12:58:53 +05:30