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: 2ef0d6a c188949)

author	Sage Weil <sage@inktank.com>
	Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
commit	466cd536ed7e541a36d88bce43683a2d9e2ca283
tree	f88a7ca0a93d1e4c470947cbd8c865caf0ba0041	tree \| snapshot
parent	2ef0d6a25bf8c0cfb38768c157c29ba52295f3ca	commit \| diff
parent	c1889497b93ae9f0a946b11d9f5f6fcc7427e934	commit \| diff

Merge pull request #1313 from ceph/dumpling-osd-subscribe

Dumpling backport: clean up osd subscriptions

src/mon/MonClient.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history

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