Merge remote-tracking branch 'gh/next'

Conflicts:
	src/messages/MMonProbe.h

diff --cc src/messages/MMonProbe.h
index d91474983f563a8369e4dda107e62013f7eb5716,2f9740743b5ba12ef68ebd3b4eb036a54cd06e3d..e417bb5bfd79eb56dc3f5483811a32fc9bd4a8f2
--- 1/src/messages/MMonProbe.h
--- 2/src/messages/MMonProbe.h
+++ b/src/messages/MMonProbe.h
@@@ -57,7 -62,11 +57,8 @@@ public
      : Message(MSG_MON_PROBE, HEAD_VERSION, COMPAT_VERSION) {}
    MMonProbe(const uuid_d& f, int o, const string& n, bool hej)
      : Message(MSG_MON_PROBE, HEAD_VERSION, COMPAT_VERSION),
-       fsid(f), op(o), name(n), has_ever_joined(hej) {}
+       fsid(f), op(o), name(n),
 -      paxos_first_version(0),
 -      paxos_last_version(0),
 -      has_ever_joined(hej),
 -      latest_version(0), newest_version(0), oldest_version(0) {}
++      has_ever_joined(hej) {}
  private:
    ~MMonProbe() {}
  

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

diff --cc src/mon/Monitor.h
Simple merge

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

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

diff --cc src/osd/osd_types.h
Simple merge