]> 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: 4274fd0 f922dc4)
Merge branch 'next' into t
authorSage Weil <sage.weil@dreamhost.com>
Sat, 28 Apr 2012 14:46:23 +0000 (07:46 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sat, 28 Apr 2012 14:46:23 +0000 (07:46 -0700)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.