Merge branch 'master' of github.com:firebase/firebase-functions

Lauren Long · Lauren Long · commit 13b4d6dae575 · 2017-03-30T10:45:59.000-07:00
diff --git a/changelog.txt b/changelog.txt
@@ -0,0 +1,2 @@
+changed - Removes temporary “shim” for analytics event timestamps.
+fixed - Fixes return type for DeltaSnapshot#getPriority() for database functions
diff --git a/src/providers/database.ts b/src/providers/database.ts
@@ -179,7 +179,7 @@ export class DeltaSnapshot implements firebase.database.DataSnapshot {
   exportVal(): any { return this.val(); }
 
   // TODO(inlined): figure out what to do here
-  getPriority(): any {
+  getPriority(): string|number|null {
     return 0;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+changed - Removes temporary “shim” for analytics event timestamps.`
	`2`	`+fixed - Fixes return type for DeltaSnapshot#getPriority() for database functions`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ export class DeltaSnapshot implements firebase.database.DataSnapshot {`
`179`	`179`	`exportVal(): any { return this.val(); }`
`180`	`180`
`181`	`181`	`// TODO(inlined): figure out what to do here`
`182`		`- getPriority(): any {`
	`182`	`+ getPriority(): string\|number\|null {`
`183`	`183`	`return 0;`
`184`	`184`	`}`
`185`	`185`