From: Kefu Chai <kchai@redhat.com>
Date: Fri, 11 Dec 2020 08:07:03 +0000 (+0800)
Subject: Merge pull request #38384 from bk201/wip-48406
X-Git-Tag: v16.1.0~301
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e28e6f41b12ab80e7f449f0ef3adaabb3d7ce81;p=ceph.git

Merge pull request #38384 from bk201/wip-48406

mgr/dashboard: fix test_dashboard_e2e.sh errors

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
---

6e28e6f41b12ab80e7f449f0ef3adaabb3d7ce81
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
index 4ddf454c6408,1421c9277a35..7b6c44742a75
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
@@@ -5,9 -5,8 +5,9 @@@ import { Router } from '@angular/router
  import _ from 'lodash';
  
  import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model';
 +import { HostService } from '~/app/shared/api/host.service';
  import { OrchestratorService } from '~/app/shared/api/orchestrator.service';
- import { SubmitButtonComponent } from '~/app/shared/components/submit-button/submit-button.component';
+ import { FormButtonPanelComponent } from '~/app/shared/components/form-button-panel/form-button-panel.component';
  import { ActionLabelsI18n } from '~/app/shared/constants/app.constants';
  import { Icons } from '~/app/shared/enum/icons.enum';
  import { CdForm } from '~/app/shared/forms/cd-form';