]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
committerSage Weil <sage@redhat.com>
Sat, 10 Jan 2015 05:43:49 +0000 (21:43 -0800)
1  2 
src/osd/OSD.cc
src/osdc/Objecter.h

diff --cc src/osd/OSD.cc
Simple merge
Simple merge