]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-cors-rebased'
authorSage Weil <sage@inktank.com>
Mon, 1 Apr 2013 06:23:47 +0000 (23:23 -0700)
committerSage Weil <sage@inktank.com>
Mon, 1 Apr 2013 06:23:47 +0000 (23:23 -0700)
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

Trivial merge