Commit 570303a0 authored by Jason Wu's avatar Jason Wu
Browse files

Merge branch 'jasonwu-dev-patch-92217' into 'dev'

merging to dev

See merge request mpifr-bdg/mpikat!96
parents 9bc3dfcf 061bf623
......@@ -353,7 +353,7 @@ class EddMasterController(EDDPipeline):
yield futures
@state_change(target="set", allowed=["ready", "measurement_starting", "configured", "streaming"], intermediate="measurement_preparing")
@state_change(target="set", allowed=["set", "ready", "measurement_starting", "measurement_stopping", "configured", "streaming"], intermediate="measurement_preparing")
@coroutine
def measurement_prepare(self, config_json=""):
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment