Skip to content
Prev Previous commit
Next Next commit
Merge branch 'master' into SPARK-24063
  • Loading branch information
gaborgsomogyi committed Jan 24, 2019
commit 357f83477fa26acee4633f91e9f5dcd7c9e2b802
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.spark.sql.streaming.continuous

import org.mockito.{ArgumentCaptor, InOrder}
import org.mockito.Matchers.{any, eq => eqTo}
import org.mockito.ArgumentMatchers.{any, eq => eqTo}
import org.mockito.Mockito._
import org.scalatest.BeforeAndAfterEach
import org.scalatest.mockito.MockitoSugar
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.