]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eee9da4 80a9d99)
Merge pull request #3090 from ceph/wip-mon-fixes
authorJoão Eduardo Luís <jecluis@gmail.com>
Fri, 16 Jan 2015 18:32:54 +0000 (18:32 +0000)
committerJoão Eduardo Luís <jecluis@gmail.com>
Fri, 16 Jan 2015 18:32:54 +0000 (18:32 +0000)
mon: fix issues with mixed-version monitors features

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history
src/mon/Monitor.h patch | diff1 | diff2 | blob | history

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