]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 719dc17 c4b2abd)
Merge remote-tracking branch 'gh/giant'
authorSage Weil <sage@redhat.com>
Fri, 24 Oct 2014 18:19:39 +0000 (11:19 -0700)
committerSage Weil <sage@redhat.com>
Fri, 24 Oct 2014 18:19:39 +0000 (11:19 -0700)
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.