]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4ca36b 8799872)
Merge branch 'wip-mon-trim'
authorSage Weil <sage@inktank.com>
Tue, 9 Jul 2013 18:10:30 +0000 (11:10 -0700)
committerSage Weil <sage@inktank.com>
Tue, 9 Jul 2013 18:10:30 +0000 (11:10 -0700)
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
1  2 
src/mon/PaxosService.h patch | diff1 | diff2 | blob | history

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