]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 490ae48 cb9262a)
Merge remote-tracking branch 'origin/wip-9806-giant' into giant
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 28 Oct 2014 20:08:05 +0000 (13:08 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 28 Oct 2014 20:09:06 +0000 (13:09 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osdc/Objecter.cc patch | diff1 | diff2 | blob | history

diff --cc src/osdc/Objecter.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.