Diffusion SHRINE MedCo Fork ffcf1a33173e

fixed conflicts
ffcf1a33173e
Actions

Authored by yifan xing <xing.yif@husky.neu.edu> on Sep 12 2017, 20:54.

Description

fixed conflicts

Details

Committed

yifan xing <xing.yif@husky.neu.edu>

Sep 14 2017, 21:05

Pushed

mickmis

Oct 25 2017, 14:31

Parents

R2664:af5d687719fc: cleaned up

Branches

Unknown

Tags

Unknown

Event Timeline

yifan xing <xing.yif@husky.neu.edu> committed R2664:ffcf1a33173e: fixed conflicts (authored by yifan xing <xing.yif@husky.neu.edu>).Sep 14 2017, 21:05

Changes (8)

				Path
	M			apps/meta-app/src/main/scala/net/shrine/metadata/QepReceiver.scala
	M			messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HornetQMomWebClient.scala
	M			messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala
	M			messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/LocalHornetQMom.scala
	M			messagequeue/hornetqmom/src/test/scala/net/shrine/hornetqmom/HornetQMomWebApiTest.scala
	M			messagequeue/hornetqmom/src/test/scala/net/shrine/hornetqmom/LocalHornetQMomTest.scala
	A			messagequeue/messagequeueservice/src/main/scala/net/shrine/messagequeueservice/Message.scala
	M			messagequeue/messagequeueservice/src/main/scala/net/shrine/messagequeueservice/MessageQueueService.scala

R2664:ffcf1a33173e

View Options

apps/meta-app/src/main/scala/net/shrine/metadata/QepReceiver.scala

View Options

messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HornetQMomWebClient.scala

View Options

messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala

View Options

messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/LocalHornetQMom.scala

View Options

messagequeue/hornetqmom/src/test/scala/net/shrine/hornetqmom/HornetQMomWebApiTest.scala

View Options

messagequeue/hornetqmom/src/test/scala/net/shrine/hornetqmom/LocalHornetQMomTest.scala

View Options

messagequeue/messagequeueservice/src/main/scala/net/shrine/messagequeueservice/Message.scala

View Options

messagequeue/messagequeueservice/src/main/scala/net/shrine/messagequeueservice/MessageQueueService.scala

fixed conflictsffcf1a33173eActions

Description

Details

Event Timeline

Changes (8)

R2664:ffcf1a33173e

apps/meta-app/src/main/scala/net/shrine/metadata/QepReceiver.scala

messagequeue/hornetqclient/src/main/scala/net/shrine/hornetqclient/HornetQMomWebClient.scala

messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQMomWebApi.scala

messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/LocalHornetQMom.scala

messagequeue/hornetqmom/src/test/scala/net/shrine/hornetqmom/HornetQMomWebApiTest.scala

messagequeue/hornetqmom/src/test/scala/net/shrine/hornetqmom/LocalHornetQMomTest.scala

messagequeue/messagequeueservice/src/main/scala/net/shrine/messagequeueservice/Message.scala

messagequeue/messagequeueservice/src/main/scala/net/shrine/messagequeueservice/MessageQueueService.scala

fixed conflicts
ffcf1a33173e
Actions