]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbb5620 5bdae2a)
Merge branch 'testing' into rc
authorSage Weil <sage@newdream.net>
Wed, 1 Dec 2010 18:20:43 +0000 (10:20 -0800)
committerSage Weil <sage@newdream.net>
Wed, 1 Dec 2010 18:20:43 +0000 (10:20 -0800)
Conflicts:
configure.ac

1  2 
src/os/FileStore.cc patch | diff1 | diff2 | blob | history

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