From: Sage Weil <sage@inktank.com>
Date: Tue, 23 Jul 2013 01:46:23 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c5b68c38385044f006d8cc60fe9a7563d85b9c0;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	PendingReleaseNotes
---

2c5b68c38385044f006d8cc60fe9a7563d85b9c0
diff --cc PendingReleaseNotes
index 33959991410a,7a9adf7293e9..ec184746c589
--- a/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.
  
 +* 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.
++  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.
++