]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 784d1d3 d734381)
Merge branch 'stable'
authorSage Weil <sage@inktank.com>
Tue, 15 May 2012 03:30:35 +0000 (20:30 -0700)
committerSage Weil <sage@inktank.com>
Tue, 15 May 2012 03:30:35 +0000 (20:30 -0700)
Conflicts:
src/osdc/Objecter.cc

1  2 
src/osdc/Objecter.h patch | diff1 | diff2 | blob | history

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