Skip to content

Conversation

@rezolya
Copy link
Contributor

@rezolya rezolya commented Feb 9, 2016

No description provided.

(cherry picked from commit c03fdde)
…orward it to endpoint

(cherry picked from commit b82378a)
(cherry picked from commit c03fdde)
…orward it to endpoint

(cherry picked from commit b82378a)
…' into feature/21-adjust-stub-responses

Conflicts:
	src/it/scala/castalia/StubServerTest.scala
	src/main/scala/castalia/Receptionist.scala
	src/main/scala/castalia/actors/JsonEndpointActor.scala
	src/main/scala/castalia/management/Manager.scala
	src/main/scala/castalia/management/ManagerService.scala
	src/main/scala/castalia/model/Messages.scala
	src/main/scala/castalia/model/Model.scala
	src/test/scala/castalia/ManagerServiceSpec.scala
	src/test/scala/castalia/actors/ReceptionistSpec.scala
Conflicts:
	src/main/scala/castalia/Receptionist.scala
	src/main/scala/castalia/matcher/RequestMatcher.scala
	src/test/scala/castalia/matcher/RequestMatcherTest.scala

// We are assured that we are getting the dispatcher assigned to this actor
// in case it differs from the main dispatcher for the system.
import context._
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants