]> 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: 2c5dcd3 412e412)
Merge branch 'wip-12971' of git://github.com/jcsp/ceph
authorGreg Farnum <gfarnum@redhat.com>
Mon, 21 Sep 2015 22:55:04 +0000 (15:55 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 21 Sep 2015 22:55:04 +0000 (15:55 -0700)
commitfe54bd1bbe5714b2613876bce857234ede26f68a
tree59acbe3cb320271689d8cecd7f75b546138fe766tree | snapshot
parent2c5dcd34c14fdb7f7cb442a52c6218a2345a3046commit | diff
parent412e412aa6a85071946b4f0b83751c0421c52365commit | diff
Merge branch 'wip-12971' of git://github.com/jcsp/ceph

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
src/osdc/Objecter.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osdc/Objecter.cc diff1 | diff2 | blob | history
src/osdc/Objecter.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.