Merge pull request #96 from concubidated/master

Fix output of command 'ceph osd tree --format=json'

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-03-08 13:49:04 -08:00
commit 2c40124bcb

View File

@ -1598,14 +1598,12 @@ void OSDMap::print_tree(ostream *out, Formatter *f) const
if (out)
*out << "\n";
if (f) {
f->dump_float("crush_weight", weight);
f->dump_unsigned("depth", depth);
f->close_section();
}
touched.insert(cur);
}
if (f) {
f->dump_float("crush_weight", weight);
f->dump_unsigned("depth", depth);
}
if (cur >= 0) {
continue;
}