]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita4ca4a73475db8a1e502f3f5394382da7a36a280
tree0d4e1a700d7cbe3d23cc927978c6ffb4a950571ftree | snapshot
parenta1dbc9ceec5a35743d4aa75b726426bbcce56ebacommit | diff
parentcf4f7027e7a05090d3d1c14f2ac4db73bf1d8fa4commit | diff
Merge remote-tracking branch 'gh/wip-7212-sage-b'

We should carefully backport some or all of this.

Backport: emperor, dumpling
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
src/mon/Monitor.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.