]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17d4a7c cbae6a4)
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Thu, 21 Mar 2013 07:40:16 +0000 (00:40 -0700)
committerGary Lowell <gary.lowell@inktank.com>
Thu, 21 Mar 2013 07:40:16 +0000 (00:40 -0700)
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.