Merge branch 'wip-7701' of git://github.com/xinxinsh/ceph into hammer

Conflicts:
	src/osd/osd_types.h

diff --cc qa/workunits/cephtool/test.sh
Simple merge

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

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

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

diff --cc src/osd/osd_types.h
index 7c7504b2c9ae705edef039e624a6098e7b0a1114,02a88f0020c9cf25b81154d622beb5593bb1f586..11b92a60779523ad7f909be95d8bd6c1a074dc4c
--- 1/src/osd/osd_types.h
--- 2/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@@ -768,10 -768,10 +768,12 @@@ inline ostream& operator<<(ostream& out
  #define PG_STATE_RECOVERY_WAIT (1<<22) // waiting for recovery reservations
  #define PG_STATE_UNDERSIZED    (1<<23) // pg acting < pool size
  #define PG_STATE_ACTIVATING   (1<<24) // pg is peered but not yet active
 +#define PG_STATE_PEERED        (1<<25) // peered, cannot go active, can recover
  
  std::string pg_state_string(int state);
 +std::string pg_vector_string(const vector<int32_t> &a);
+ int pg_string_state(std::string state);
+ 
  
  /*
   * pool_snap_info_t