import quincy beta 17.1.0

[ceph.git] / ceph / src / test / cli / monmaptool / clobber.t

diff --git a/ceph/src/test/cli/monmaptool/clobber.t b/ceph/src/test/cli/monmaptool/clobber.t
index 087c4b9f5f22c682da526ca2c3904a767ceb242b..a63deac711d0b1c263041fbc2285aa9319fa312f 100644 (file)
--- a/ceph/src/test/cli/monmaptool/clobber.t
+++ b/ceph/src/test/cli/monmaptool/clobber.t
@@ -1,6 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 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 (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -17,7 +18,7 @@
   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}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 0 (unknown)
+  min_mon_release 15 (octopus)
   election_strategy: 1
   0: v1:2.3.4.5:6789/0 mon.foo
 
@@ -27,6 +28,7 @@
   $ monmaptool --create --clobber 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)
 
   $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -38,5 +40,5 @@
   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}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 0 (unknown)
+  min_mon_release 15 (octopus)
   election_strategy: 1