]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1dbc9c cf4f702)
Merge remote-tracking branch 'gh/wip-7212-sage-b'
authorSage Weil <sage@inktank.com>
Mon, 17 Feb 2014 19:07:55 +0000 (11:07 -0800)
committerSage Weil <sage@inktank.com>
Mon, 17 Feb 2014 19:07:55 +0000 (11:07 -0800)
We should carefully backport some or all of this.

Backport: emperor, dumpling
Reviewed-by: Joao Eduardo Luis <joao.luis@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.