From: Kefu Chai Date: Sun, 15 Apr 2018 14:49:50 +0000 (+0800) Subject: Merge pull request #19117 from jan--f/jan-object-counts-decimal X-Git-Tag: v13.1.0~258 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d4186fb5419faea3844dda1044545e91fbc4ae66;p=ceph-ci.git Merge pull request #19117 from jan--f/jan-object-counts-decimal include/types: format decimal numbers with decimal factor Reviewed-by: Sage Weil --- d4186fb5419faea3844dda1044545e91fbc4ae66 diff --cc src/test/cli/monmaptool/feature-set-unset-list.t index 216566ebb48,306a495cb6d..f574b4318f9 --- a/src/test/cli/monmaptool/feature-set-unset-list.t +++ b/src/test/cli/monmaptool/feature-set-unset-list.t @@@ -24,11 -24,11 +24,11 @@@ monmap:persistent:[none] monmap:optional:[none] monmap:required:[none] - available:supported:[kraken(1),luminous(2),mimic(4)] - available:persistent:[kraken(1),luminous(2),mimic(4)] + available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8)] + available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8)] $ monmaptool --feature-set foo /tmp/test.monmap.1234 - unknown features name 'foo' or unable to parse value: Expected option value to be integer, got 'foo' + unknown features name 'foo' or unable to parse value: The option value 'foo' contains invalid digits usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--set-initial-members] [--add name 1.2.3.4:567] [--rm name]