]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-bigbang'
authorSage Weil <sage@redhat.com>
Mon, 23 Nov 2015 13:39:46 +0000 (08:39 -0500)
committerSage Weil <sage@redhat.com>
Mon, 23 Nov 2015 13:39:46 +0000 (08:39 -0500)
commit5135292d9557269bab5cefc98d39606174aa6ebe
treefc6f51cf4608f361b38388150d52bfae248100fd
parent083c2e42c663229ce505f74c40d8261ca530a79b
parent9aabc8a9b8d7775337716c4e0fa3cc53938acb45
Merge branch 'wip-bigbang'

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
src/common/config_opts.h
src/msg/async/AsyncConnection.cc
src/msg/simple/Pipe.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osdc/Objecter.cc