From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Feb 2015 01:19:44 +0000 (-0800)
Subject: Merge branch 'wip-7701' of git://github.com/xinxinsh/ceph into hammer
X-Git-Tag: v0.93~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6035aee328814c5c0e3f2a3ffc90c3a39bb3d2f;p=ceph.git

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

Conflicts:
	src/osd/osd_types.h
---

a6035aee328814c5c0e3f2a3ffc90c3a39bb3d2f
diff --cc src/osd/osd_types.h
index 7c7504b2c9ae,02a88f0020c9..11b92a607795
--- a/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