rebase

Author: andrewseguin

src/demo-app/data-table/person-data-source.ts

@@ -2,6 +2,8 @@ import {CollectionViewer, DataSource, MdPaginator, MdSort} from '@angular/materi
 import {Observable} from 'rxjs/Observable';
 import {PeopleDatabase, UserData} from './people-database';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
+import 'rxjs/add/observable/combineLatest';
+import 'rxjs/add/observable/merge';
 import 'rxjs/add/operator/map';
 
 export class PersonDataSource extends DataSource<any> {
@@ -20,7 +22,7 @@ export class PersonDataSource extends DataSource<any> {
     // determining the updated display data.
     Observable.merge(this._paginator.page,
         this._peopleDatabase.dataChange,
-        this._sort.sortChange).subscribe(() => {
+        this._sort.mdSortChange).subscribe(() => {
       this._renderedData = [];
       this.updateDisplayData();
     });

src/lib/sort/sort.spec.ts

@@ -10,6 +10,7 @@ import {
   getMdSortHeaderNotContainedWithinMdSortError
 } from './sort-errors';
 import {wrappedErrorMessage} from '../core/testing/wrapped-error-message';
+import {map} from '../core/rxjs/index';
 
 describe('MdSort', () => {
   let fixture: ComponentFixture<SimpleMdSortApp>;
@@ -224,7 +225,7 @@ class SimpleMdSortApp {
 
 class FakeDataSource extends DataSource<any> {
   connect(collectionViewer: CollectionViewer): Observable<any[]> {
-    return collectionViewer.viewChange.map(() => []);
+    return map.call(collectionViewer.viewChange, () => []);
   }
 }