]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Fri, 19 Dec 2014 19:55:58 +0000 (11:55 -0800)
committerSage Weil <sage@redhat.com>
Fri, 19 Dec 2014 19:55:58 +0000 (11:55 -0800)
commit60674621023c3f2abc94e677bcf1866b7a5e2b7b
treeb374aae3bb9d53cdbbd744aa1178d57267ea73d7
parent61126a2d712e12b1c948a7cffab07f27e74784b6
parent08bd1e1eee37c80ee033c067f678236da38b1694
Merge remote-tracking branch 'gh/next'
configure.ac
src/osd/OSD.cc
src/osd/OSD.h