Merge branch 'wip-osd-hb'

Reviewed-by: Samuel Just <samuel.just@dreamhost.com>

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

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

diff --cc src/osd/PG.h
index a8976991732c19e8453c5e7f43ebe881945fc191,5632af5d246e472bcdb136c3be2c02e7dca92206..5ea380e1f021a872a04bdfc4508c633e0e66a571
--- 1/src/osd/PG.h
--- 2/src/osd/PG.h
+++ b/src/osd/PG.h
@@@ -1237,8 -1245,8 +1246,9 @@@ public
      role(0),
      state(0),
      need_up_thru(false),
 +    need_flush(false),
      last_peering_reset(0),
+     heartbeat_peer_lock("PG::heartbeat_peer_lock"),
      backfill_target(-1),
      pg_stats_lock("PG::pg_stats_lock"),
      pg_stats_valid(false),
@@@ -1294,9 -1302,10 +1304,12 @@@
  
    bool  is_empty() const { return info.last_update == eversion_t(0,0); }
  
+   void init(int role, vector<int>& up, vector<int>& acting, pg_history_t& history,
+           ObjectStore::Transaction *t);
+ 
    // pg on-disk state
 +  void do_pending_flush();
 +
    void write_info(ObjectStore::Transaction& t);
    void write_log(ObjectStore::Transaction& t);