]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7680cda 9832696)
Merge branch 'stable'
authorSage Weil <sage.weil@dreamhost.com>
Fri, 6 Apr 2012 19:26:12 +0000 (12:26 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 6 Apr 2012 19:26:12 +0000 (12:26 -0700)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/os/FileStore.cc patch | diff1 | diff2 | blob | history

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