]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ba1433 7802292)
Merge pull request #335 from ceph/wip-5176
authorSage Weil <sage@inktank.com>
Thu, 30 May 2013 22:04:21 +0000 (15:04 -0700)
committerSage Weil <sage@inktank.com>
Thu, 30 May 2013 22:04:21 +0000 (15:04 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/mon/Paxos.cc patch | diff1 | diff2 | blob | history

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