]> 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: cd1d6fb a97ecca)
Merge branch 'wip-4837-election-syncing' into next
authorGreg Farnum <greg@inktank.com>
Tue, 30 Apr 2013 22:39:21 +0000 (15:39 -0700)
committerGreg Farnum <greg@inktank.com>
Tue, 30 Apr 2013 22:39:21 +0000 (15:39 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

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