]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'guangyy/wip-9008' into giant
authorSamuel Just <sam.just@inktank.com>
Tue, 7 Oct 2014 18:42:14 +0000 (11:42 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 7 Oct 2014 18:42:14 +0000 (11:42 -0700)
commit1d22575cb097752f4cff3b24899b7eb21ed73a0f
tree3c923d4884de7c043538388ebf30a470ecd96ef1
parent887652f66c3f6f9eebf96dc15b998e7dc7c6a999
parent0f884fdb31a26f241401ce2a9329dc0f2c4eccc7
Merge remote-tracking branch 'guangyy/wip-9008' into giant
src/osdc/Objecter.cc
src/osdc/Objecter.h