]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
committerSage Weil <sage@redhat.com>
Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
commit585efcb7e45b0a81ff2f0a5b76fe8c38c848df45
tree088b1bad4191379b6781188414dd401b369815ef
parent18d6a083310f0b922e31d904599f0e51c94bc289
parent58b5e02890a88fa6cc4943ac2365aa0006550778
Merge remote-tracking branch 'gh/next'
src/osd/OSD.cc
src/osdc/Objecter.h