2 commits

Author	SHA1	Message	Date
Oswaldo Ferreira	a6c52c4e59	Make merge_jid handling less stateful in MergeService	2017-10-27 22:33:48 +02:00
Oswaldo Ferreira	0640b3d1d8	Store MergeWorker JID on merge request, and clean up stuck merges	2017-08-07 15:23:37 -03:00