diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:17 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:44 +0000 |
| commit | 17d6a993fc17d533460c5f40f3908c708e057c18 (patch) | |
| tree | 1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /src/mon/ConfigMap.cc | |
| parent | Releasing progress-linux version 18.2.2-0progress7.99u1. (diff) | |
| download | ceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip | |
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/mon/ConfigMap.cc')
| -rw-r--r-- | src/mon/ConfigMap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mon/ConfigMap.cc b/src/mon/ConfigMap.cc index 763b8ce9b..7a639947b 100644 --- a/src/mon/ConfigMap.cc +++ b/src/mon/ConfigMap.cc @@ -66,7 +66,7 @@ void OptionMask::dump(Formatter *f) const void MaskedOption::dump(Formatter *f) const { - f->dump_string("name", opt->name); + f->dump_string("name", localized_name); f->dump_string("value", raw_value); f->dump_string("level", Option::level_to_str(opt->level)); f->dump_bool("can_update_at_runtime", opt->can_update_at_runtime()); @@ -76,7 +76,7 @@ void MaskedOption::dump(Formatter *f) const ostream& operator<<(ostream& out, const MaskedOption& o) { - out << o.opt->name; + out << o.localized_name; if (o.mask.location_type.size()) { out << "@" << o.mask.location_type << '=' << o.mask.location_value; } |