Merge remote-tracking branch 'gh/next'

Conflicts:
	PendingReleaseNotes

diff --cc PendingReleaseNotes
index 33959991410a8a29c7fee6bf4bfc2d93aad579b7,7a9adf7293e99f69d0c06ce4d3db7162400255cc..ec184746c589d55b0ed023914e3c14d098f85edc
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -20,7 -20,8 +20,14 @@@ v0.6
    for deployment in a more-capable web server.  See ceph-rest-api.8
    for more.
  
-   accordingly.
 +* The radosgw caps were inconsistently documented to be either 'mon =
 +  allow r' or 'mon = allow rw'.  The 'mon = allow rw' is required for
 +  radosgw to create its own pools.  All documentation has been updated
++  accordingly.
++
+ * rgw copy object operation may return extra progress info during the
+   operation. At this point it will only happen when doing cross zone
+   copy operations. The S3 response will now return extra <Progress>
+   field under the <CopyResult> container. The Swift response will
+   now send the progress as a json array.
++

diff --cc src/ceph.in
Simple merge

diff --cc src/mds/MDS.cc
Simple merge