commit 73d43153e9bb99c2c64946cacef1c22c28d31bf0 Merge: f14488ae 83303ffd Author: Simone Basso <bassosimone@gmail.com> Date: Wed Jan 25 20:55:45 2017 +0100 Merge pull request #713 from TheTorProject/feature/deck-status Feature/deck status ooni/agent/scheduler.py | 2 +- ooni/deck/deck.py | 29 +++++++++++++++++++-------- ooni/deck/legacy.py | 12 +++++++++++ ooni/deck/store.py | 3 +-- ooni/director.py | 27 +++++++++++++++++++++++++ ooni/measurements.py | 38 +++++++++++++++++++++++------------ ooni/tests/test_deck.py | 6 ++++-- ooni/tests/test_scheduler.py | 2 +- ooni/ui/cli.py | 2 +- ooni/ui/web/server.py | 47 ++++++++++++++++++++++++-------------------- ooni/utils/__init__.py | 6 ++++-- 11 files changed, 123 insertions(+), 51 deletions(-)