From: Sage Weil Date: Mon, 1 Apr 2013 06:23:47 +0000 (-0700) Subject: Merge remote-tracking branch 'gh/wip-cors-rebased' X-Git-Tag: v0.62~124 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=945ead5a8172a293bc602b8cc878238a88a99ee8;p=ceph.git Merge remote-tracking branch 'gh/wip-cors-rebased' Reviewed-by: Yehuda Sadeh --- 945ead5a8172a293bc602b8cc878238a88a99ee8