Merge branch 'wip-crush'

Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/test/encoding/types.h
index 8e11f7648e9df713f754a93da481d80023f4fe5d,1d5587f0a4ab44f9073a8a24f4f9af94a7a821b2..bdb4e911eded65e57ebbdd06cf6effadf94d5bcb
--- 1/src/test/encoding/types.h
--- 2/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@@ -20,8 -20,10 +20,11 @@@ TYPE(entity_addr_t
  #include "osd/OSDMap.h"
  TYPE(osd_info_t)
  TYPE(OSDMap)
 +TYPE(OSDMap::Incremental)
  
+ #include "crush/CrushWrapper.h"
+ TYPE(CrushWrapper)
+ 
  #include "osd/PG.h"
  TYPE(PG::Interval)
  TYPE(PG::OndiskLog)