]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #19117 from jan--f/jan-object-counts-decimal
authorKefu Chai <tchaikov@gmail.com>
Sun, 15 Apr 2018 14:49:50 +0000 (22:49 +0800)
committerGitHub <noreply@github.com>
Sun, 15 Apr 2018 14:49:50 +0000 (22:49 +0800)
include/types: format decimal numbers with decimal factor

Reviewed-by: Sage Weil <sage@redhat.com>
19 files changed:
1  2 
qa/workunits/cephtool/test.sh
src/ceph_mon.cc
src/common/options.cc
src/common/util.cc
src/kv/RocksDBStore.cc
src/mon/OSDMonitor.cc
src/mon/PGMap.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/KernelDevice.cc
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/osd_types.h
src/rgw/rgw_admin.cc
src/test/cli/monmaptool/feature-set-unset-list.t
src/test/objectstore_bench.cc
src/tools/ceph_kvstore_tool.cc
src/tools/rados/rados.cc
src/tools/rbd/ArgumentTypes.cc
src/tools/rbd_nbd/rbd-nbd.cc

Simple merge
diff --cc src/ceph_mon.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge
Simple merge
index 216566ebb48a05575207e87a59fdd04fcda9e9f0,306a495cb6db52d75bd4e9cda56e5a16eef18e34..f574b4318f990a568fcc71e0b69654748f15fc99
    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]
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge