From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 17 Jul 2019 13:37:11 +0000 (+0200)
Subject: Merge branch 'master' into ansible_orchestrator
X-Git-Tag: v15.1.0~2185^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57b96c67051cf361d796eb657741a6c61b51ebad;p=ceph-ci.git

Merge branch 'master' into ansible_orchestrator
---

57b96c67051cf361d796eb657741a6c61b51ebad
diff --cc src/pybind/mgr/orchestrator.py
index 424e55a4ee2,0dc084f3ff1..ee9a289ecb3
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@@ -8,8 -8,7 +8,9 @@@ import sy
  import time
  import fnmatch
  import uuid
 +import string
 +import random
+ import datetime
  
  import six