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: e384798 d5a453f)

author	Sage Weil <sage@inktank.com>
	Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
committer	Sage Weil <sage@inktank.com>
	Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
commit	a3f50267aea09109c4a7a8b48a3884fd569a033a
tree	4eb31f3eb99bdc4f6a168cc1d18e6773bd44e36c	tree \| snapshot
parent	e3847986cf1dec01341bf10b30c9f3d6e2c98d48	commit \| diff
parent	d5a453f06b194ded195d401144e7d1c1b389302b	commit \| diff

Merge remote-tracking branch 'gh/wip-3484'

Reviewed-by: Sage Weil <sage@inktank.com>

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	diff1 \|	diff2 \|	blob \| history

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