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: 039a3a9 bb270f8)

author	Sage Weil <sage@inktank.com>
	Thu, 2 May 2013 20:32:41 +0000 (13:32 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 2 May 2013 20:32:41 +0000 (13:32 -0700)
commit	4f49565b409c9459862b12b012e41b0f7abb698b
tree	35f453f695b0e735f09a2087286c5dd8cfb85d94	tree \| snapshot
parent	039a3a97cea66dbfa78e98fd991d5e872390ca4f	commit \| diff
parent	bb270f86a4b3cff2afc0d53a490860be2621efa3	commit \| diff

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

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

src/common/config_opts.h

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