]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e9b97c1 d597dc2)
Merge branch 'wip-encoding'
authorSage Weil <sage.weil@dreamhost.com>
Fri, 3 Feb 2012 01:00:38 +0000 (17:00 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 3 Feb 2012 01:00:38 +0000 (17:00 -0800)
commit0dcbc86ca009ef361d0a4f84157e4ca9707f0d07
tree01ef2bc66dcf6be598315880e19406177b59846btree | snapshot
parente9b97c13665c6230c6fe9453cca1c00a85144fcccommit | diff
parentd597dc2d5bed09204cd1b521d8d576301cdce94ecommit | diff
Merge branch 'wip-encoding'

Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
Conflicts:
src/msg/Message.h
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h
13 files changed:
src/Makefile.am diff1 | diff2 | blob | history
src/client/Client.cc diff1 | diff2 | blob | history
src/librados.cc diff1 | diff2 | blob | history
src/msg/Message.h diff1 | diff2 | blob | history
src/msg/SimpleMessenger.cc diff1 | diff2 | blob | history
src/msg/SimpleMessenger.h diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/OSD.h diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/PG.h diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h diff1 | diff2 | blob | history
src/osdc/Objecter.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.