]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c06260f 94239ec)
Merge remote branch 'origin/objecter-latest-map'
authorSage Weil <sage.weil@dreamhost.com>
Mon, 1 Aug 2011 20:35:23 +0000 (13:35 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 1 Aug 2011 20:35:23 +0000 (13:35 -0700)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

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