]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31102d3 ad663d5)
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Mon, 21 May 2012 04:18:36 +0000 (21:18 -0700)
committerSage Weil <sage@newdream.net>
Mon, 21 May 2012 04:18:36 +0000 (21:18 -0700)
Conflicts:
src/os/FileStore.cc

1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.