Merge remote-tracking branch 'origin/next'

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/MonmapMonitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
index 47f1c82d3cb65668939e1ae82e37f92f2ee8702c,9b1631828a8a25fd38504e3d4e33bb307fd13f58..cf95c3fcc6b96329274f0ad5f0100553c0adf5a4
--- 1/src/mon/OSDMonitor.cc
--- 2/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -2000,18 -1962,8 +2000,19 @@@ void OSDMonitor::dump_info(Formatter *f
    osdmap.dump(f);
    f->close_section();
  
 +  f->open_array_section("osd_metadata");
 +  for (int i=0; i<osdmap.get_max_osd(); ++i) {
 +    if (osdmap.exists(i)) {
 +      f->open_object_section("osd");
 +      f->dump_unsigned("id", i);
 +      dump_osd_metadata(i, f, NULL);
 +      f->close_section();
 +    }
 +  }
 +  f->close_section();
 +
    f->dump_unsigned("osdmap_first_committed", get_first_committed());
+   f->dump_unsigned("osdmap_last_committed", get_last_committed());
  
    f->open_object_section("crushmap");
    osdmap.crush->dump(f);