]> 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: d536096 c89b7f2)
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Wed, 28 Mar 2012 02:58:54 +0000 (19:58 -0700)
committerSage Weil <sage@newdream.net>
Wed, 28 Mar 2012 02:58:54 +0000 (19:58 -0700)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
src/os/FileStore.cc patch | diff1 | diff2 | blob | history

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