]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa7448c b10848e)
Merge branch 'wip-4982-4983-oloc-rebase'
authorDavid Zafman <david.zafman@inktank.com>
Tue, 9 Jul 2013 23:24:22 +0000 (16:24 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Tue, 9 Jul 2013 23:24:53 +0000 (16:24 -0700)
commit51dbc389c4b0695393c6aebb2d553c00741afc39
treeb6a80dc4b04844bf11ea5cc5364db644b2e532b5tree | snapshot
parentaa7448cd1794858896f3c26606362827f267b11ccommit | diff
parentb10848e212d9469e0c1663ace59d3cf15525ca01commit | diff
Merge branch 'wip-4982-4983-oloc-rebase'

fixes: #4982
fixes: #4983

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
src/include/rados/librados.hpp diff1 | diff2 | blob | history
src/librados/librados.cc diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h diff1 | diff2 | blob | history
src/osd/osd_types.cc diff1 | diff2 | blob | history
src/osd/osd_types.h diff1 | diff2 | blob | history
src/osdc/Objecter.h diff1 | diff2 | blob | history
src/test/osd/TestPGLog.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.