import quincy beta 17.1.0

[ceph.git] / ceph / src / test / cli / monmaptool / create-print.t

diff --git a/ceph/src/test/cli/monmaptool/create-print.t b/ceph/src/test/cli/monmaptool/create-print.t
index 3059b79183159a21d249800851dffb06a9a12777..d8d5c074a9e458f1e0b4f5c3d0505ec53dfc0a39 100644 (file)
--- a/ceph/src/test/cli/monmaptool/create-print.t
+++ b/ceph/src/test/cli/monmaptool/create-print.t
@@ -1,18 +1,23 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
+  setting min_mon_release = octopus
   monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ monmaptool --print mymonmap
   monmaptool: monmap file mymonmap
   epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
-  created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
+  last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
+  created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
+  min_mon_release 15 (octopus)
+  election_strategy: 1
 
   $ monmaptool --print -- mymonmap
   monmaptool: monmap file mymonmap
   epoch 0
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
-  created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
+  last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
+  created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
+  min_mon_release 15 (octopus)
+  election_strategy: 1