git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff

]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff

projects / ceph.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f1a56e 143ec02)

author	Sage Weil <sage@inktank.com>
	Fri, 21 Mar 2014 21:52:12 +0000 (14:52 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 21 Mar 2014 21:52:12 +0000 (14:52 -0700)

backport 7212 fixes to emperor

		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

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