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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ebab04e b8af38b)

author	Sage Weil <sage@inktank.com>
	Tue, 30 Jul 2013 19:40:55 +0000 (12:40 -0700)
committer	Sage Weil <sage@inktank.com>
	Tue, 30 Jul 2013 19:40:55 +0000 (12:40 -0700)
commit	60cbed3fcd15d50cddb2999c2cfb800506453dea
tree	b466e05cecfd629245ae4b3721e8462d0e1dfb15	tree \| snapshot
parent	ebab04e01802f529ebfba280bb4ca5d6b6c4404f	commit \| diff
parent	b8af38b6fc161691d637631d9ce8ab84fb3d27c7	commit \| diff

Merge remote-tracking branch 'gh/wip-mon' into next

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>

src/mon/Monitor.h

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