Merge branch 'next'

diff --cc src/ceph_mds.cc
Simple merge

diff --cc src/ceph_mon.cc
Simple merge

diff --cc src/ceph_osd.cc
Simple merge

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

diff --cc src/osd/OSD.cc
Simple merge