]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
1  2 
src/osdc/Objecter.cc
src/osdc/Objecter.h

Simple merge
Simple merge