Merge branch 'master' into mrschmidt/indexfree-master

Author: schmidt-sebastian

firebase-firestore/src/test/resources/json/limbo_spec_test.json

@@ -3441,27 +3441,21 @@
       "numClients": 1
     },
     "steps": [
-      {
-        "drainQueue": true,
-        "clientIndex": 0
-      },
       {
         "userSet": [
           "collection/a",
           {
             "matches": true
           }
-        ],
-        "clientIndex": 0
+        ]
       },
       {
         "userSet": [
           "collection/b",
           {
             "matches": true
           }
-        ],
-        "clientIndex": 0
+        ]
       },
       {
         "writeAck": {
@@ -3474,8 +3468,7 @@
             ],
             "rejectedDocs": []
           }
-        },
-        "clientIndex": 0
+        }
       },
       {
         "writeAck": {
@@ -3488,8 +3481,7 @@
             ],
             "rejectedDocs": []
           }
-        },
-        "clientIndex": 0
+        }
       },
       {
         "userListen": [
@@ -3547,14 +3539,12 @@
             "fromCache": true,
             "hasPendingWrites": false
           }
-        ],
-        "clientIndex": 0
+        ]
       },
       {
         "watchAck": [
           2
-        ],
-        "clientIndex": 0
+        ]
       },
       {
         "watchEntity": {
@@ -3574,17 +3564,15 @@
           "targets": [
             2
           ]
-        },
-        "clientIndex": 0
+        }
       },
       {
         "watchCurrent": [
           [
             2
           ],
           "resume-token-2000"
-        ],
-        "clientIndex": 0
+        ]
       },
       {
         "watchSnapshot": {
@@ -3613,8 +3601,7 @@
               "resumeToken": ""
             }
           }
-        },
-        "clientIndex": 0
+        }
       },
       {
         "userListen": [
@@ -3706,8 +3693,7 @@
             "fromCache": true,
             "hasPendingWrites": false
           }
-        ],
-        "clientIndex": 0
+        ]
       },
       {
         "userUnlisten": [
@@ -3736,8 +3722,7 @@
             }
           },
           "limboDocs": []
-        },
-        "clientIndex": 0
+        }
       },
       {
         "userListen": [
@@ -3809,8 +3794,7 @@
             "fromCache": true,
             "hasPendingWrites": false
           }
-        ],
-        "clientIndex": 0
+        ]
       }
     ]
   }