]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'bclibcoop/next-cors' of https://github.com/BCLibCoop/ceph into next
authorYehuda Sadeh <yehuda@inktank.com>
Sun, 19 Jan 2014 05:48:30 +0000 (21:48 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Sun, 19 Jan 2014 05:48:30 +0000 (21:48 -0800)
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

Trivial merge