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: 446e077 c888d1d)

author	Sage Weil <sage@inktank.com>
	Thu, 30 May 2013 23:27:02 +0000 (16:27 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 30 May 2013 23:27:02 +0000 (16:27 -0700)
commit	38ed3e43f52366006b04fe1bed6ebbfaf25f19ca
tree	813036fff2374711a1bdcaa1f59a96e963110d2f	tree \| snapshot
parent	446e0770c77de5d72858dcf7a95c5b19f642cf98	commit \| diff
parent	c888d1d3f1b77e62d1a8796992e918d12a009b9d	commit \| diff

Merge pull request #334 from ceph/wip-mon

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

src/mon/Monitor.cc

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