From: Sage Weil <sage@redhat.com>
Date: Mon, 22 Dec 2014 14:51:14 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.92~106
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20a4c57c4bb4fcfae68469c60a60d71c0188148a;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	PendingReleaseNotes
---

20a4c57c4bb4fcfae68469c60a60d71c0188148a
diff --cc PendingReleaseNotes
index 842794cb1439,f94c98fb7fec..ae3b5b184ba4
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -30,5 -44,8 +30,10 @@@ v0.9
    a bogus value (for example, when rados_watch() returns an error and
    handle is not defined).
  
+ * The structure of the formatted 'pg stat' command is changed for the
+   portion that counts states by name to avoid using the '+' character
+   (which appears in state names) as part of the XML token (it is not
+   legal).
+ 
 +v0.92
 +-----