From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:52:52 +0000 (+0100)
Subject: Merge pull request #38496 from bk201/wip-48460-octopus
X-Git-Tag: v15.2.9~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5093eb46cf69e2e2037a2b44936494fe6705ab08;p=ceph.git

Merge pull request #38496 from bk201/wip-48460-octopus

octopus: mgr/dashboard: allow selecting all daemons for Orchestrator NFS clusters

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
---

5093eb46cf69e2e2037a2b44936494fe6705ab08
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts
index 2b9a07d81082,45f31530623f..01da887fefb6
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts
@@@ -9,7 -9,11 +9,8 @@@ import { ToastrModule } from 'ngx-toast
  
  import { ActivatedRouteStub } from '../../../../testing/activated-route-stub';
  import { configureTestBed, i18nProviders } from '../../../../testing/unit-test-helper';
 -import { CephReleaseNamePipe } from '../../../shared/pipes/ceph-release-name.pipe';
 -import { SummaryService } from '../../../shared/services/summary.service';
  import { SharedModule } from '../../../shared/shared.module';
+ import { NFSClusterType } from '../nfs-cluster-type.enum';
  import { NfsFormClientComponent } from '../nfs-form-client/nfs-form-client.component';
  import { NfsFormComponent } from './nfs-form.component';