]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #21826 from tspmelo/rxjs6
authorLenz Grimmer <lenz@grimmer.com>
Tue, 5 Jun 2018 11:19:29 +0000 (13:19 +0200)
committerGitHub <noreply@github.com>
Tue, 5 Jun 2018 11:19:29 +0000 (13:19 +0200)
mgr/dashboard: Update RxJS to version 6

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
1  2 
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts
src/pybind/mgr/dashboard/frontend/tslint.json

index 3628460800fd1eacaef229282de48a1006f6b811,a6dbd6bcd160a50fcb04860d018278f89c58d29d..fa40a44482b96d358112b41c96d4a539df6701c2
@@@ -1,9 -1,8 +1,7 @@@
  import { Component, ViewChild } from '@angular/core';
 -import { Router } from '@angular/router';
  
  import { BsModalService } from 'ngx-bootstrap';
- import 'rxjs/add/observable/forkJoin';
- import { Observable } from 'rxjs/Observable';
- import { Subscriber } from 'rxjs/Subscriber';
+ import { forkJoin as observableForkJoin, Observable, Subscriber } from 'rxjs';
  
  import { RgwBucketService } from '../../../shared/api/rgw-bucket.service';
  import { DeletionModalComponent } from '../../../shared/components/deletion-modal/deletion-modal.component';
index 8c9376fdfb4e00f37ab058e9643386391f13620f,49b0e04018775fae03456b00c89ae163d24396ff..02d6e8d9211cb596efb3eec540acbd820d7092ef
@@@ -1,9 -1,8 +1,7 @@@
  import { Component, ViewChild } from '@angular/core';
 -import { Router } from '@angular/router';
  
  import { BsModalService } from 'ngx-bootstrap';
- import 'rxjs/add/observable/forkJoin';
- import { Observable } from 'rxjs/Observable';
- import { Subscriber } from 'rxjs/Subscriber';
+ import { forkJoin as observableForkJoin, Observable, Subscriber } from 'rxjs';
  
  import { RgwUserService } from '../../../shared/api/rgw-user.service';
  import { DeletionModalComponent } from '../../../shared/components/deletion-modal/deletion-modal.component';
index 0781275be578481e61c707bc5eb6a1f9660cd6b5,84bdf0a9d5e8a5cf5fdbdb3247a6d57e8d3f4471..c8c1b788aa0fca2f8a413327abc5f895b14c561c
@@@ -3,9 -3,9 +3,8 @@@ import { async, ComponentFixture, fakeA
  import { ReactiveFormsModule } from '@angular/forms';
  
  import { BsModalRef, BsModalService, ModalModule } from 'ngx-bootstrap';
- import { Observable } from 'rxjs/Observable';
- import { Subscriber } from 'rxjs/Subscriber';
+ import { Observable, Subscriber, timer as observableTimer } from 'rxjs';
  
 -import { ModalComponent } from '../modal/modal.component';
  import { DeletionModalComponent } from './deletion-modal.component';
  
  @NgModule({