fix bad merge

Author: Brendan Doyle

core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerPool.scala

@@ -26,6 +26,7 @@ import org.apache.openwhisk.core.connector.{
   ContainerCreationAckMessage,
   ContainerCreationMessage,
   ContainerDeletionMessage,
+  GetState,
   ResultMetadata
 }
 import org.apache.openwhisk.core.containerpool.{
@@ -76,7 +77,6 @@ case class DeletionContainer(deletionMessage: ContainerDeletionMessage)
 case object Remove
 case class Keep(timeout: FiniteDuration)
 case class PrewarmContainer(maxConcurrent: Int)
-case object GetState
 
 /**
  * A pool managing containers to run actions on.

core/invoker/src/main/scala/org/apache/openwhisk/core/containerpool/v2/FunctionPullingContainerProxy.scala

@@ -152,6 +152,7 @@ case class InitializedData(container: Container,
                            override val clientProxy: ActorRef)
     extends ContainerAvailableData(container, invocationNamespace, action)
     with WithClient {
+  override def getContainer = Some(container)
   def toReschedulingData(resumeRun: RunActivation) =
     ReschedulingData(container, invocationNamespace, action, clientProxy, resumeRun)
 }
@@ -164,6 +165,7 @@ case class WarmData(container: Container,
                     override val clientProxy: ActorRef)
     extends ContainerAvailableData(container, invocationNamespace, action)
     with WithClient {
+  override def getContainer = Some(container)
   def toReschedulingData(resumeRun: RunActivation) =
     ReschedulingData(container, invocationNamespace, action, clientProxy, resumeRun)
 }

core/invoker/src/main/scala/org/apache/openwhisk/core/invoker/FPCInvokerReactive.scala

@@ -30,7 +30,7 @@ import org.apache.openwhisk.core.ack.{ActiveAck, HealthActionAck, MessagingActiv
 import org.apache.openwhisk.core.connector._
 import org.apache.openwhisk.core.containerpool._
 import org.apache.openwhisk.core.containerpool.logging.LogStoreProvider
-import org.apache.openwhisk.core.containerpool.v2.{GetState => GetPoolState, _}
+import org.apache.openwhisk.core.containerpool.v2._
 import org.apache.openwhisk.core.database._
 import org.apache.openwhisk.core.entity._
 import org.apache.openwhisk.core.etcd.EtcdKV.ContainerKeys.containerPrefix
@@ -390,7 +390,7 @@ class FPCInvokerReactive(config: WhiskConfig,
 
   override def getPoolState(): Future[Either[NotSupportedPoolState, TotalContainerPoolState]] = {
     implicit val timeout: Timeout = 5.seconds
-    (pool ? GetPoolState).mapTo[TotalContainerPoolState].map(Right(_))
+    (pool ? GetState).mapTo[TotalContainerPoolState].map(Right(_))
   }
 
   override def isEnabled(): String = {