]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4a07df de013c2)
Merge branch 'unstable' into standby_replay
authorGreg Farnum <gregory.farnum@dreamhost.com>
Mon, 24 Jan 2011 19:06:46 +0000 (11:06 -0800)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Mon, 24 Jan 2011 19:06:46 +0000 (11:06 -0800)
1  2 
src/config.cc patch | diff1 | diff2 | blob | history
src/mds/MDS.cc patch | diff1 | diff2 | blob | history

diff --cc src/config.cc
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.