Merge branch 'master' of github.com:NewDreamNetwork/ceph

Conflicts:
	src/osd/PG.cc

diff --cc src/osd/PG.cc
index f20f623800945bdf8cd95bd6cb30f74290a8b5bf,03a1e838af3e02a4a40a571beab6f0e61cb4a0cf..8ce09a7d752fc14e48f24c24910c4ff388cdc816
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -3475,10 -3474,8 +3480,10 @@@ void PG::on_removal(
    remove_watchers_and_notifies();
  }
  
 -void PG::set_last_peering_reset() {
 +void PG::set_last_peering_reset()
 +{
-   dout(20) << "set_last_peering_reset " << osd->osdmap->get_epoch() << dendl;
-   last_peering_reset = osd->osdmap->get_epoch();
++  dout(20) << "set_last_peering_reset " << get_osdmap()->get_epoch() << dendl;
+   last_peering_reset = get_osdmap()->get_epoch();
  }
  
  /* Called before initializing peering during advance_map */

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