]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/giant'
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 28 Oct 2014 20:10:52 +0000 (13:10 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 28 Oct 2014 20:10:52 +0000 (13:10 -0700)
commit548dfa5f02e2b056047618f4129560454ea60aab
treee3b5904dc4f5783411c1f84154601db751cdaf22
parent54abbc61fd0d2c28e641aa6fa0f9ef7986cfd207
parent5d74c8101ca891a1bea49a74e41ac1bea33a0117
Merge remote-tracking branch 'origin/giant'
src/osdc/Objecter.cc
src/osdc/Objecter.h