git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f04defe 6f49100)

author	John Spray <jspray@redhat.com>
	Mon, 10 Jul 2017 14:03:07 +0000 (15:03 +0100)
committer	GitHub <noreply@github.com>
	Mon, 10 Jul 2017 14:03:07 +0000 (15:03 +0100)
commit	44bce9e02cdb135867420b6d04051276ed4f1bb8
tree	378838c71e5ab47647f74ab470db8df2d33172b1	tree \| snapshot
parent	f04defe1b8da251e31db050ff8fda91ccbee0e6f	commit \| diff
parent	6f491006d37897ca4a44d07d9b00429ac01428c9	commit \| diff

Merge pull request #15858 from liewegas/wip-mgr-servicemap

mgr,librados: service map

Reviewed-by: John Spray <john.spray@redhat.com>

src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.